Context Navigation

KML_MultiGeometry.h

Timestamp:

01/27/12 08:19:58 (13 years ago)

Author:

Eric.Larour

Message:

merged trunk-jpl and trunk for revision 11236

Location:

issm/trunk

Files:

Property svn:ignore

-              old
+              new
+autom4te.cache
+aclocal.m4
 bin
+config.log
+config.h
+config.h.in
+config.status
 configure
+doxygen
+ISSM.paf
+ISSM.ppf
+ISSM.ppf_cache
+libtool
+list
 Makefile
 Makefile.in
-ISSM.paf
-list
-ISSM.ppf_cache
-config.log
-config.h
-.ignore.txt
-config.status
 stamp-h1
 svn-commit*
-ISSM.ppf
-config.h.in
-autom4te.cache
-aclocal.m4
-doxygen

Property svn:mergeinfo changed

-              r9883
+              r11237
                 void  Echo();
                 void  DeepEcho();
                 void  DeepEcho(char* indent);
                 void  Write(FILE* fid,char* indent);
+                void  DeepEcho(const char* indent);
+                void  Write(FILE* fid,const char* indent);
                 void  Read(FILE* fid,char* kstr);
                 void  WriteExp(FILE* fid,char* nstr,int sgn,double cm,double sp);
+                void  WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp);
                 int   Id(){_error_("Not implemented yet.");};
                 int   MyRank(){_error_("Not implemented yet.");};

Note: See TracChangeset for help on using the changeset viewer.