Changeset 10624 for code/trunk/src/libraries/core/input/InputManager.cc

Timestamp:

Oct 4, 2015, 9:12:21 PM (10 years ago)

Author:

landauf

Message:

merged branch core7 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/libraries/core/input/InputManager.cc (modified) (2 diffs)

code/trunk/src/libraries/core/input/InputManager.cc

@@ -48 +48 @@
 #include "core/GraphicsManager.h"
 #include "core/config/ConfigValueIncludes.h"
-#include "core/config/CommandLineParser.h"
-#include "core/command/ConsoleCommand.h"
+#include "core/commandline/CommandLineIncludes.h"
+#include "core/command/ConsoleCommandIncludes.h"
 #include "core/command/Functor.h"
 
@@ -85 +85 @@
         return (lval = (InputManager::State)(lval & rval));
     }
+
+    RegisterAbstractClass(InputManager).inheritsFrom<WindowEventListener>();
 
     // ############################################################