Changeset 10073 for code/branches/presentationFS14/src/orxonox/items
- Timestamp:
- May 22, 2014, 2:49:16 PM (11 years ago)
- Location:
- code/branches/presentationFS14
- Files:
-
- 2 edited
- 4 copied
-
. (modified) (1 prop)
-
src/orxonox/items/CMakeLists.txt (modified) (1 diff)
-
src/orxonox/items/PartDestructionEvent.cc (copied) (copied from code/branches/modularships/src/orxonox/items/PartDestructionEvent.cc)
-
src/orxonox/items/PartDestructionEvent.h (copied) (copied from code/branches/modularships/src/orxonox/items/PartDestructionEvent.h)
-
src/orxonox/items/ShipPart.cc (copied) (copied from code/branches/modularships/src/orxonox/items/ShipPart.cc)
-
src/orxonox/items/ShipPart.h (copied) (copied from code/branches/modularships/src/orxonox/items/ShipPart.h)
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentationFS14
- Property svn:mergeinfo changed
/code/branches/modularships (added) merged: 9994-9997,10001-10003,10007,10011,10019,10023,10029,10033,10036,10052-10055,10058,10067-10068,10071
- Property svn:mergeinfo changed
-
code/branches/presentationFS14/src/orxonox/items/CMakeLists.txt
r5781 r10073 3 3 Engine.cc 4 4 MultiStateEngine.cc 5 ShipPart.cc 6 PartDestructionEvent.cc 5 7 )
Note: See TracChangeset
for help on using the changeset viewer.
