Context Navigation

KML_MultiGeometry.cpp

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

-              r10840
+              r11237
 /*FUNCTION KML_MultiGeometry::DeepEcho {{{1*/
 void  KML_MultiGeometry::DeepEcho(char* indent){
+void  KML_MultiGeometry::DeepEcho(const char* indent){
         int   i;
 …
 /*FUNCTION KML_MultiGeometry::Write {{{1*/
 void  KML_MultiGeometry::Write(FILE* filout,char* indent){
+void  KML_MultiGeometry::Write(FILE* filout,const char* indent){
         int   i;
 …
 /*FUNCTION KML_MultiGeometry::WriteExp {{{1*/
 void  KML_MultiGeometry::WriteExp(FILE* fid,char* nstr,int sgn,double cm,double sp){
+void  KML_MultiGeometry::WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp){
         int   i;

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