scrawl 974fda5bde Merge branch 'master' of https://github.com/OpenMW/openmw into osg ... Conflicts: extern/sdl4ogre/sdlwindowhelper.cpp		2015-06-03 03:18:29 +02:00
..
connector.cpp
connector.hpp
setting.cpp
setting.hpp
support.hpp
usersettings.cpp
usersettings.hpp