[simspark-cvs] simspark/spark/oxygen Makefile.am, 1.5, 1.6 oxygen.cpp, 1.2, 1.3 oxygen.h, 1.2, 1.3

[Oliver O. <fr...@us...>]

Update of /cvsroot/simspark/simspark/spark/oxygen
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv21072/oxygen

Modified Files:
	Makefile.am oxygen.cpp oxygen.h 
Log Message:
merge from projectx branch

Index: oxygen.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/oxygen.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** oxygen.h	14 Apr 2006 16:27:26 -0000	1.2
--- oxygen.h	17 Jun 2007 13:38:31 -0000	1.3
***************
*** 75,78 ****
--- 75,79 ----
  
  #include "geometryserver/geometryserver.h"
+ #include "geometryserver/meshexporter.h"
  #include "geometryserver/meshimporter.h"
  #include "geometryserver/stdmeshimporter.h"

Index: oxygen.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/oxygen.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** oxygen.cpp	14 Apr 2006 16:27:26 -0000	1.2
--- oxygen.cpp	17 Jun 2007 13:38:31 -0000	1.3
***************
*** 46,49 ****
--- 46,50 ----
      // geometry
      zg.GetCore()->RegisterClassObject(new CLASS(GeometryServer), "oxygen/");
+     zg.GetCore()->RegisterClassObject(new CLASS(MeshExporter), "oxygen/");
      zg.GetCore()->RegisterClassObject(new CLASS(MeshImporter), "oxygen/");
      zg.GetCore()->RegisterClassObject(new CLASS(StdMeshImporter), "oxygen/");

Index: Makefile.am
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile.am	17 May 2007 17:49:23 -0000	1.5
--- Makefile.am	17 Jun 2007 13:38:31 -0000	1.6
***************
*** 150,153 ****
--- 150,154 ----
  geometryserver/geometryserver.cpp \
  geometryserver/geometryserver_c.cpp \
+ geometryserver/meshexporter_c.cpp \
  geometryserver/meshimporter.cpp \
  geometryserver/meshimporter_c.cpp \
***************
*** 223,226 ****
--- 224,228 ----
  simulationserver/netbuffer.h \
  geometryserver/geometryserver.h \
+ geometryserver/meshexporter.h \
  geometryserver/meshimporter.h \
  geometryserver/stdmeshimporter.h \