Changeset 1755 for code/trunk/src/orxonox/gamestates/GSRoot.cc
- Timestamp:
- Sep 10, 2008, 1:37:36 AM (16 years ago)
- Location:
- code/trunk
- Files:
-
- 1 edited
- 2 copied
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/gui (added) merged: 1636,1638,1640-1647,1649-1654,1656,1659-1665,1670,1672-1674,1686,1688-1692,1694-1697,1704 /code/branches/input (added) merged: 1629-1630
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/gamestates/GSRoot.cc
r1724 r1755 40 40 #include "core/ConsoleCommand.h" 41 41 #include "core/CommandLine.h" 42 #include " core/Debug.h"42 #include "util/Debug.h" 43 43 #include "core/Exception.h" 44 44 #include "core/TclBind.h" … … 95 95 { 96 96 #if ORXONOX_DEBUG_MODE == 1 97 ConfigFileManager::get Singleton()->setFile(CFT_Settings, "orxonox_d.ini");97 ConfigFileManager::getInstance()->setFile(CFT_Settings, "orxonox_d.ini"); 98 98 #else 99 ConfigFileManager::get Singleton()->setFile(CFT_Settings, "orxonox.ini");99 ConfigFileManager::getInstance()->setFile(CFT_Settings, "orxonox.ini"); 100 100 #endif 101 101
Note: See TracChangeset
for help on using the changeset viewer.