[simspark-cvs] simspark/spark/oxygen/simulationserver simulationserver.h, 1.2.2.1, 1.2.2.1.2.1

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

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

Modified Files:
      Tag: projectx
	simulationserver.h 
Log Message:
merge from HEAD


Index: simulationserver.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/simulationserver/simulationserver.h,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.1.2.1
diff -C2 -d -r1.2.2.1 -r1.2.2.1.2.1
*** simulationserver.h	16 Feb 2007 15:42:57 -0000	1.2.2.1
--- simulationserver.h	17 Jun 2007 07:53:55 -0000	1.2.2.1.2.1
***************
*** 66,69 ****
--- 66,72 ----
      virtual float GetTime();
  
+     /** resets the simulation time */
+     virtual void ResetTime();
+ 
      /** sets the simulation time step */
      virtual void SetSimStep(float deltaTime);