Changeset 10216 for code/trunk/src/orxonox/items

Timestamp:

Jan 31, 2015, 6:03:17 PM (11 years ago)

Author:

landauf

Message:

merged branch presentationFS14 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/items/CMakeLists.txt (modified) (1 diff)
• src/orxonox/items/PartDestructionEvent.cc (copied) (copied from code/branches/presentationFS14/src/orxonox/items/PartDestructionEvent.cc)
• src/orxonox/items/PartDestructionEvent.h (copied) (copied from code/branches/presentationFS14/src/orxonox/items/PartDestructionEvent.h)
• src/orxonox/items/ShipPart.cc (copied) (copied from code/branches/presentationFS14/src/orxonox/items/ShipPart.cc)
• src/orxonox/items/ShipPart.h (copied) (copied from code/branches/presentationFS14/src/orxonox/items/ShipPart.h)

code/trunk/src/orxonox/items/CMakeLists.txt

@@ -3 +3 @@
   Engine.cc
   MultiStateEngine.cc
+  ShipPart.cc
+  PartDestructionEvent.cc
 )