mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-04-02 04:06:42 +00:00
Code Issues Releases Wiki Activity

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

Browse source
This commit is contained in:
Marc Zinnschlag 2012-11-06 18:21:24 +01:00
commit 81a2c629d8
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwinput/inputmanagerimp.cpp
View file

@ -9,7 +9,7 @@
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>
#include <OIS/OISInputManager.h> #include <OISInputManager.h>
#include <MyGUI_InputManager.h> #include <MyGUI_InputManager.h>
#include <MyGUI_RenderManager.h> #include <MyGUI_RenderManager.h>

4
apps/openmw/mwinput/inputmanagerimp.hpp
View file

@ -42,8 +42,8 @@ namespace OIS
class InputManager; class InputManager;
} }
#include <OIS/OISKeyboard.h> #include <OISKeyboard.h>
#include <OIS/OISMouse.h> #include <OISMouse.h>
#include <extern/oics/ICSChannelListener.h> #include <extern/oics/ICSChannelListener.h>
#include <extern/oics/ICSInputControlSystem.h> #include <extern/oics/ICSInputControlSystem.h>