Merge remote-tracking branch 'scrawl/master' into next

12 years ago · 81a2c629d8
parent 6d5333be05 21e0cde914
commit 81a2c629d8
2 changed files with 3 additions and 3 deletions
--- a/apps/openmw/mwinput/inputmanagerimp.cpp
+++ b/apps/openmw/mwinput/inputmanagerimp.cpp
@ -9,7 +9,7 @@

 #include <boost/lexical_cast.hpp>

-#include <OIS/OISInputManager.h>
+#include <OISInputManager.h>

 #include <MyGUI_InputManager.h>
 #include <MyGUI_RenderManager.h>
--- a/apps/openmw/mwinput/inputmanagerimp.hpp
+++ b/apps/openmw/mwinput/inputmanagerimp.hpp
@ -42,8 +42,8 @@ namespace OIS
    class InputManager;
 }

-#include <OIS/OISKeyboard.h>
-#include <OIS/OISMouse.h>
+#include <OISKeyboard.h>
+#include <OISMouse.h>

 #include <extern/oics/ICSChannelListener.h>
 #include <extern/oics/ICSInputControlSystem.h>