mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-26 14:56:39 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'cc9cii/master'

Browse source
This commit is contained in:
Marc Zinnschlag 2014-06-12 12:46:04 +02:00
commit 82eb13c070
3 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/openmw/mwstate/charactermanager.cpp
View file

@ -3,6 +3,7 @@
#include <sstream>
#include <stdexcept>
#include <cctype> // std::isalnum
#include <boost/filesystem.hpp>

1
extern/oics/ICSPrerequisites.h vendored
View file

@ -36,6 +36,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <map>
#include <list>
#include <limits>
#include <algorithm> /* std::min and std::max for MSVC 2013 */
#include "tinyxml.h"

2
extern/sdl4ogre/sdlinputwrapper.hpp vendored
View file

@ -1,6 +1,8 @@
#ifndef SDL4OGRE_SDLINPUTWRAPPER_H
#define SDL4OGRE_SDLINPUTWRAPPER_H
#define NOMINMAX
#include <SDL_events.h>
#include <OgreRenderWindow.h>