Changeset 9526 for code/trunk/src/modules/objects

Timestamp:

Feb 19, 2013, 10:25:42 AM (12 years ago)

Author:

jo

Message:

Merging presentationHS12 back to the trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/objects/CMakeLists.txt (modified) (1 diff)
• src/modules/objects/ObjectsPrereqs.h (modified) (1 diff)
• src/modules/objects/Turret.cc (copied) (copied from code/branches/presentationHS12/src/modules/objects/Turret.cc)
• src/modules/objects/Turret.h (copied) (copied from code/branches/presentationHS12/src/modules/objects/Turret.h)

code/trunk/src/modules/objects/CMakeLists.txt

@@ -5 +5 @@
   Script.cc
   SpaceBoundaries.cc
+  Turret.cc
 )
 

code/trunk/src/modules/objects/ObjectsPrereqs.h

@@ -73 +73 @@
     class Script;
     class SpaceBoundaries;
+    class Turret;
 
     // collisionshapes