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/KML/KML_Icon.cpp

    r12946 r13101  
    145145                }
    146146                else if (!strncmp(kstri,"</",2))
    147                   {_error2_("KML_Icon::Read -- Unexpected closing tag " << kstri << ".\n");}
     147                  {_error_("KML_Icon::Read -- Unexpected closing tag " << kstri << ".\n");}
    148148                else if (strncmp(kstri,"<",1))
    149                   {_error2_("KML_Icon::Read -- Unexpected field \"" << kstri << "\".\n");}
     149                  {_error_("KML_Icon::Read -- Unexpected field \"" << kstri << "\".\n");}
    150150
    151151                else if (!strcmp(kstri,"<href>"))
Note: See TracChangeset for help on using the changeset viewer.