Update of /cvsroot/simspark/simspark/spark/oxygen
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv2954
Modified Files:
Tag: projectx
Makefile.am
Log Message:
merge from HEAD
Index: Makefile.am
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/Makefile.am,v
retrieving revision 1.3.2.2.2.1
retrieving revision 1.3.2.2.2.2
diff -C2 -d -r1.3.2.2.2.1 -r1.3.2.2.2.2
*** Makefile.am 5 Apr 2007 04:18:00 -0000 1.3.2.2.2.1
--- Makefile.am 17 Jun 2007 08:24:15 -0000 1.3.2.2.2.2
***************
*** 130,133 ****
--- 130,134 ----
sceneserver/camera.cpp \
sceneserver/camera_c.cpp \
+ sceneserver/scenedict.cpp \
simulationserver/simulationserver.h \
simulationserver/simulationserver.cpp \
|
