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/src/c/classes/objects/Loads/Icefront.h

    r12494 r13101  
    6464                void  InputUpdateFromConstant(bool constant, int name);
    6565                void  InputUpdateFromSolution(IssmDouble* solution);
    66                 void  InputUpdateFromIoModel(int index, IoModel* iomodel){_error2_("not implemented yet");};
     66                void  InputUpdateFromIoModel(int index, IoModel* iomodel){_error_("not implemented yet");};
    6767                /*}}}*/
    6868                /*Load virtual functions definitions: {{{*/
Note: See TracChangeset for help on using the changeset viewer.