Ignore:
Timestamp:
01/19/16 17:01:36 (8 years ago)
Author:
dumas
Message:

Merge avec la r34 du trunk

Location:
branches/iLoveclim
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/iLoveclim

  • branches/iLoveclim/SOURCES/Makefile.grisli.inc

    r31 r35  
    214214        lect-anteis_mod.o \ 
    215215        bmelt-ant-regions_mod.o \ 
     216        bmelt-ant-regions-oce_mod.o \ 
    216217        fake-routines-ant_mod.o module_choix-antar40-0.4.o \ 
    217218        track_ant40_mod.o 
     
    515516 
    516517bmelt-ant-regions_mod.o : Ant40_files/bmelt-ant-regions_mod.f90 
    517         $(FT)  Ant40_files/bmelt-ant-regions_mod.f90 
     518        $(FT) Ant40_files/bmelt-ant-regions_mod.f90 
     519 
     520bmelt-ant-regions-oce_mod.o : Ant40_files/bmelt-ant-regions-oce_mod.f90 
     521        $(FT) Ant40_files/bmelt-ant-regions-oce_mod.f90 
    518522 
    519523bmelt-nor-regions_mod.o : Heminord_files/bmelt-nor-regions_mod.f90 
Note: See TracChangeset for help on using the changeset viewer.