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

      • TabularUnified  

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

  • TabularUnified issm/branches/trunk-jpl-damage/src/c/modules/KMLMeshWritex/KMLMeshWritex.cpp

    r12878 r13101  
    133133                                        }
    134134                                        else
    135                                                 _error2_("Nodal connectivity table needs more than specified " << mxepg << " columns.\n");
     135                                                _error_("Nodal connectivity table needs more than specified " << mxepg << " columns.\n");
    136136                                }
    137137                                jpt++;
    … …  
    173173
    174174                else
    175                         _error2_("Data matrix has incorrect number of " << mdata << " rows.\n");
     175                        _error_("Data matrix has incorrect number of " << mdata << " rows.\n");
    176176        }
    177177
Note: See TracChangeset for help on using the changeset viewer.