Changeset 6942 for code/branches/presentation3/src/orxonox/overlays
- Timestamp:
- May 20, 2010, 8:30:38 PM (15 years ago)
- Location:
- code/branches/presentation3
- Files:
-
- 2 deleted
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation3
- Property svn:mergeinfo changed
/code/branches/hudelements (added) merged: 6599-6600,6602,6606,6614-6615,6631,6715-6717,6727,6796,6849,6865,6868,6873-6875,6880,6886,6897-6899,6907,6913-6914,6917,6922-6924,6941
- Property svn:mergeinfo changed
-
code/branches/presentation3/src/orxonox/overlays/CMakeLists.txt
r6746 r6942 4 4 OverlayGroup.cc 5 5 6 COMPILATION_BEGIN OverlayCompilation.cc6 #COMPILATION_BEGIN OverlayCompilation.cc 7 7 InGameConsole.cc 8 Map.cc 9 COMPILATION_END 8 #COMPILATION_END 10 9 )
Note: See TracChangeset
for help on using the changeset viewer.