Changeset 8458
- Timestamp:
- May 12, 2011, 2:23:45 PM (14 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
- 3 copied
-
. (modified) (1 prop)
-
data/levels/myTestLevel.oxw (copied) (copied from code/branches/spaceboundaries/data/levels/myTestLevel.oxw)
-
src/orxonox/worldentities/CMakeLists.txt (modified) (1 diff)
-
src/orxonox/worldentities/SpaceBoundaries.cc (copied) (copied from code/branches/spaceboundaries/src/orxonox/worldentities/SpaceBoundaries.cc)
-
src/orxonox/worldentities/SpaceBoundaries.h (copied) (copied from code/branches/spaceboundaries/src/orxonox/worldentities/SpaceBoundaries.h)
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/spaceboundaries (added) merged: 8085,8087,8110,8164,8166-8167,8201,8237,8244,8279,8281,8301,8404
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/worldentities/CMakeLists.txt
r7163 r8458 12 12 SpawnPoint.cc 13 13 TeamSpawnPoint.cc 14 SpaceBoundaries.cc 14 15 ) 15 16
Note: See TracChangeset
for help on using the changeset viewer.
