Changeset 9667 for code/trunk/src/orxonox/MoodManager.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/MoodManager.cc
r8858 r9667 30 30 31 31 #include "util/ScopedSingletonManager.h" 32 #include "core/ ConfigValueIncludes.h"32 #include "core/config/ConfigValueIncludes.h" 33 33 #include "core/CoreIncludes.h" 34 34 #include "core/Resource.h" … … 43 43 MoodManager::MoodManager() 44 44 { 45 Register RootObject(MoodManager);45 RegisterObject(MoodManager); 46 46 this->setConfigValues(); 47 47 … … 95 95 MoodListener::MoodListener() 96 96 { 97 Register RootObject(MoodListener);97 RegisterObject(MoodListener); 98 98 } 99 99
Note: See TracChangeset
for help on using the changeset viewer.