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_Document.h

    r12832 r13101  
    3030                void  Write(FILE* fid,const char* indent);
    3131                void  Read(FILE* fid,char* kstr);
    32                 int   Id(){_error2_("Not implemented yet.");};
    33                 int   MyRank(){_error2_("Not implemented yet.");};
    34                 void  Marshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");};
    35                 int   MarshallSize(){_error2_("Not implemented yet.");};
    36                 void  Demarshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");};
    37                 int   ObjectEnum(){_error2_("Not implemented yet.");};
    38                 Object* copy(){_error2_("Not implemented yet.");};
     32                int   Id(){_error_("Not implemented yet.");};
     33                int   MyRank(){_error_("Not implemented yet.");};
     34                void  Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");};
     35                int   MarshallSize(){_error_("Not implemented yet.");};
     36                void  Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");};
     37                int   ObjectEnum(){_error_("Not implemented yet.");};
     38                Object* copy(){_error_("Not implemented yet.");};
    3939                /*}}}*/
    4040
Note: See TracChangeset for help on using the changeset viewer.