Changeset 3399 in orxonox.OLD for orxonox/branches/nico/src/data_tank.h

Timestamp:

Feb 6, 2005, 11:27:25 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/nico: merged trunk into branches/nico
merged with command:
svn merge ../trunk/ nico/ -r 3238:HEAD
resolved conflict in favor of branches/nico.

Location:

orxonox/branches/nico

Files:

• . (modified) (1 prop)
• src/data_tank.h (modified) (1 diff)

orxonox/branches/nico/src/data_tank.h

@@ -10 +10 @@
   ~DataTank ();
 
+  static long timeStamp;
+
 };