Ignore:
Timestamp:
07/02/13 09:24:16 (12 years ago)
Author:
Mathieu Morlighem
Message:

merged trunk-jpl and trunk for revision 15394

Location:
issm/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk

  • issm/trunk/externalpackages

    • Property svn:ignore

      •  

        old new  
        1 archive
        2 MITgcm
        3 OpenAD
        4 ivins
         1*.gz
         2*.zip
         3*.a
         4*.so
         5*.o
         6*.la
         7*.cmake
         8*.cache
         9*.exe
         10*.in
         11*.log
         12*.deps
         13*.metadata
         14install
         15src
         16CMakeCache.txt
         17Makefile
         18CMakeFiles

  • issm/trunk/externalpackages/adolc

    • Property svn:ignore

      •  

        old new  
         1trunk
        12adolc_issm
        2 adolc_v220_issm
        3 trunk
        43*.gz
        5 install*
         4*.zip
         5*.a
         6*.so
         7*.o
         8*.la
         9*.cmake
         10*.cache
         11*.exe
         12*.in
         13*.log
         14*.deps
         15*.metadata
         16install
        617src
        7 src-*
        8 configure.sh
        9 .ignore.txt
         18CMakeCache.txt
         19Makefile
         20CMakeFiles

  • issm/trunk/externalpackages/adolc/install-update-dev.sh

    r14310 r15396  
    1010
    1111#symlink:
    12 ln -s  /u/astrid-r1b/larour/issm-uci/trunk-jpl/externalpackages/adolc/adolc_issm ./adolc_issm
     12ln -s /proj/ice/larour2/issm-uci/trunk-jpl/externalpackages/adolc/adolc_issm ./adolc_issm
    1313
    1414#update and compile
Note: See TracChangeset for help on using the changeset viewer.