mirror of
https://github.com/TES3MP/openmw-tes3mp.git
synced 2025-03-30 10:36:42 +00:00
Merge remote-tracking branch 'scrawl/master' into next
This commit is contained in:
commit
81a2c629d8
2 changed files with 3 additions and 3 deletions
|
@ -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>
|
||||||
|
|
|
@ -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>
|
||||||
|
|
Loading…
Reference in a new issue