mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-03-14 10:21:09 +00:00
Merge remote-tracking branch 'scrawl/master' into next
This commit is contained in:
commit
81a2c629d8
@ -9,7 +9,7 @@
|
||||
|
||||
#include <boost/lexical_cast.hpp>
|
||||
|
||||
#include <OIS/OISInputManager.h>
|
||||
#include <OISInputManager.h>
|
||||
|
||||
#include <MyGUI_InputManager.h>
|
||||
#include <MyGUI_RenderManager.h>
|
||||
|
@ -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>
|
||||
|
Loading…
x
Reference in New Issue
Block a user