Changeset 9667 for code/trunk/src/orxonox/sound/SoundManager.cc
- Timestamp:
- Aug 25, 2013, 9:08:42 PM (11 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/core6 merged: 9552-9554,9556-9574,9577-9579,9585-9593,9596-9612,9626-9662
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/sound/SoundManager.cc
r8903 r9667 39 39 #include "util/Clock.h" 40 40 #include "util/ScopedSingletonManager.h" 41 #include "core/ ConfigValueIncludes.h"41 #include "core/config/ConfigValueIncludes.h" 42 42 #include "core/CoreIncludes.h" 43 43 #include "core/GameMode.h" … … 69 69 : effectsPoolSize_(0) 70 70 { 71 Register RootObject(SoundManager);71 RegisterObject(SoundManager); 72 72 73 73 orxout(user_status) << "Loading sound" << endl;
Note: See TracChangeset
for help on using the changeset viewer.