Changeset 1535 for code/trunk/src/orxonox/console

Timestamp:

Jun 4, 2008, 8:54:43 PM (16 years ago)

Author:

rgrieder

Message:

merged input branch back to trunk

Location:

code/trunk/src/orxonox/console

Files:

• InGameConsole.cc (modified) (1 diff)
• InGameConsole.h (modified) (1 diff)

code/trunk/src/orxonox/console/InGameConsole.cc

@@ -42 +42 @@
 #include "core/ConfigValueIncludes.h"
 #include "core/ConsoleCommand.h"
-#include "core/InputManager.h"
+#include "core/input/InputManager.h"
 #include "util/Math.h"
 #include "GraphicsEngine.h"

code/trunk/src/orxonox/console/InGameConsole.h

@@ -36 +36 @@
 #include <OgreTextAreaOverlayElement.h>
 
-#include "core/Tickable.h"
 #include "core/Shell.h"
+#include "objects/Tickable.h"