Changeset 9667 for code/trunk/src/libraries/core/input/KeyBinderManager.h
- 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/KeyBinderManager.h
r8729 r9667 36 36 37 37 #include "util/Singleton.h" 38 #include "core/ OrxonoxClass.h"38 #include "core/config/Configurable.h" 39 39 40 40 namespace orxonox //tolua_export … … 53 53 */ 54 54 class _CoreExport KeyBinderManager //tolua_export 55 : public Singleton<KeyBinderManager>, public OrxonoxClass55 : public Singleton<KeyBinderManager>, public Configurable 56 56 { //tolua_export 57 57 friend class Singleton<KeyBinderManager>;
Note: See TracChangeset
for help on using the changeset viewer.