Changeset 3196 for code/trunk/src/orxonox/PlayerManager.cc
- Timestamp:
- Jun 20, 2009, 9:20:47 AM (15 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/pch (added) merged: 3114-3118,3124-3125,3127-3131,3133,3138-3194
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/PlayerManager.cc
r3110 r3196 29 29 #include "PlayerManager.h" 30 30 31 #include " LevelManager.h"31 #include "core/CoreIncludes.h" 32 32 #include "core/GameMode.h" 33 #include "core/CoreIncludes.h"34 33 #include "objects/Level.h" 35 34 #include "objects/infos/HumanPlayer.h" 35 #include "LevelManager.h" 36 36 37 37 namespace orxonox
Note: See TracChangeset
for help on using the changeset viewer.