Changeset 5693 for code/trunk/src/orxonox/gamestates/GSRoot.h
- Timestamp:
- Aug 29, 2009, 10:19:38 PM (15 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/libraries (added) merged: 5612-5613,5615-5619,5621-5623,5625-5640,5642-5643,5647-5649,5665-5666,5685-5687,5692
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/gamestates/GSRoot.h
r3370 r5693 30 30 #define _GSRoot_H__ 31 31 32 #include " OrxonoxPrereqs.h"32 #include "gamestates/GameStatesPrereqs.h" 33 33 #include "core/GameState.h" 34 34 35 35 namespace orxonox 36 36 { 37 class _ OrxonoxExport GSRoot : public GameState37 class _GameStatesExport GSRoot : public GameState 38 38 { 39 39 public:
Note: See TracChangeset
for help on using the changeset viewer.