Changeset 10231 for code/branches/presentationHS14merge
- Timestamp:
- Feb 1, 2015, 3:07:00 PM (10 years ago)
- Location:
- code/branches/presentationHS14merge
- Files:
-
- 2 edited
- 2 copied
-
. (modified) (1 prop)
-
data/levels/4Dtest.oxw (copied) (copied from code/branches/minigame4DHS14/data/levels/4Dtest.oxw)
-
src/modules/CMakeLists.txt (modified) (1 diff)
-
src/modules/mini4dgame (copied) (copied from code/branches/minigame4DHS14/src/modules/mini4dgame)
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentationHS14merge
- Property svn:mergeinfo changed
/code/branches/minigame4DHS14 (added) merged: 10081,10088,10090,10096-10097,10100-10101,10104,10115,10121,10131,10156,10161,10168,10225-10230
- Property svn:mergeinfo changed
-
code/branches/presentationHS14merge/src/modules/CMakeLists.txt
r10216 r10231 41 41 ADD_SUBDIRECTORY(invader) 42 42 ADD_SUBDIRECTORY(jump) 43 ADD_SUBDIRECTORY(mini4dgame)
Note: See TracChangeset
for help on using the changeset viewer.
