Changeset 9667 for code/trunk/src/libraries/core/input/JoyStick.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/libraries/core/input/JoyStick.cc
r8858 r9667 34 34 35 35 #include "util/StringUtils.h" 36 #include "core/ConfigFileManager.h" 37 #include "core/ConfigValueIncludes.h" 36 #include "core/config/ConfigFile.h" 37 #include "core/config/ConfigFileManager.h" 38 #include "core/config/ConfigValueIncludes.h" 38 39 #include "core/CoreIncludes.h" 39 40 #include "util/Convert.h" … … 50 51 : super(id, oisInputManager) 51 52 { 52 Register RootObject(JoyStick);53 RegisterObject(JoyStick); 53 54 this->setConfigValues(); 54 55 // Initialise POV and Slider states
Note: See TracChangeset
for help on using the changeset viewer.