Changeset 11341 for code/branches/Presentation_HS16/src/orxonox
- Timestamp:
- Dec 14, 2016, 3:33:41 PM (9 years ago)
- Location:
- code/branches/Presentation_HS16
- Files:
- 
          - 2 edited
- 2 copied
 
 - 
          . (modified) (1 prop)
- 
          src/orxonox/gametypes/CMakeLists.txt (modified) (1 diff)
- 
          src/orxonox/gametypes/StoryMode.cc (copied) (copied from code/branches/StoryModeMap_HS16/src/orxonox/gametypes/StoryMode.cc)
- 
          src/orxonox/gametypes/StoryMode.h (copied) (copied from code/branches/StoryModeMap_HS16/src/orxonox/gametypes/StoryMode.h)
 
Legend:
- Unmodified
- Added
- Removed
- 
        code/branches/Presentation_HS16- Property svn:mergeinfo changed/code/branches/StoryModeMap_HS16 (added) merged: 11221,11229,11234,11242,11255,11269,11286,11299,11308,11316,11330 
 
- Property svn:mergeinfo changed
- 
        code/branches/Presentation_HS16/src/orxonox/gametypes/CMakeLists.txtr9016 r11341 11 11 TeamGametype.cc 12 12 Mission.cc 13 StoryMode.cc 13 14 ) 
Note: See TracChangeset
          for help on using the changeset viewer.
      


 
            







