Changeset 12030 for code/branches/mergeFS18
- Timestamp:
- Oct 10, 2018, 3:55:21 PM (6 years ago)
- Location:
- code/branches/mergeFS18
- Files:
-
- 2 edited
- 5 copied
-
. (modified) (1 prop)
-
data/levels/OrxyRoad.oxw (copied) (copied from code/branches/OrxyRoad_FS18/data/levels/OrxyRoad.oxw)
-
data/levels/templates/OrxyRoadPattern.oxt (copied) (copied from code/branches/OrxyRoad_FS18/data/levels/templates/OrxyRoadPattern.oxt)
-
data/levels/templates/spaceshipOrxyRoad.oxt (copied) (copied from code/branches/OrxyRoad_FS18/data/levels/templates/spaceshipOrxyRoad.oxt)
-
data/overlays/OrxyRoadHUD.oxo (copied) (copied from code/branches/OrxyRoad_FS18/data/overlays/OrxyRoadHUD.oxo)
-
src/modules/CMakeLists.txt (modified) (1 diff)
-
src/modules/orxyroad (copied) (copied from code/branches/OrxyRoad_FS18/src/modules/orxyroad)
Legend:
- Unmodified
- Added
- Removed
-
code/branches/mergeFS18
- Property svn:mergeinfo changed
/code/branches/OrxyRoad_FS18 (added) merged: 11823,11835-11839,11851,11853,11881-11888,11891,11899,11908,11914,11916,11934-11935,11970,11972,11975,11980-11981,11985,11994,11996,11998
- Property svn:mergeinfo changed
-
code/branches/mergeFS18/src/modules/CMakeLists.txt
r11783 r12030 49 49 ADD_SUBDIRECTORY(asteroids2D) 50 50 ADD_SUBDIRECTORY(flappyorx) 51 ADD_SUBDIRECTORY(orxyroad)
Note: See TracChangeset
for help on using the changeset viewer.
