Ignore:
Timestamp:
08/20/12 17:39:30 (13 years ago)
Author:
cborstad
Message:

merged trunk-jpl through revision 13099 into branch

Location:
issm/branches/trunk-jpl-damage
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • issm/branches/trunk-jpl-damage

    • Property svn:ignore

      •  

        old new  
         1projects
        12autom4te.cache
        23aclocal.m4
    • Property svn:mergeinfo changed
      /issm/trunk-jplmerged: 12948-13099

  • issm/branches/trunk-jpl-damage/test/NightlyRun/IdToName.py

    r12946 r13101  
    6767                234 : 'SquareShelfTranForceNeg2dDakotaSamp',
    6868                235 : 'SquareShelfTranForceNeg2dDakotaLocal',
    69                 236 : 'SquareShelfTranIspddIsdeltaM2d';
    70                 237 : 'SquareShelfTranIspddIsdeltaM3d';
     69                236 : 'SquareShelfTranIspddIsdeltaM2d',
     70                237 : 'SquareShelfTranIspddIsdeltaM3d',
    7171                301 : 'SquareSheetConstrainedDiagM2d',
    7272                302 : 'SquareSheetConstrainedDiagH2d',
Note: See TracChangeset for help on using the changeset viewer.