scrawl 3663511cdb Merge branch 'master' of https://github.com/OpenMW/openmw into osg ... Conflicts: apps/opencs/CMakeLists.txt extern/ogre-ffmpeg-videoplayer/CMakeLists.txt		2015-06-16 19:53:41 +02:00
..
settings
utils
CMakeLists.txt	Merge branch 'master' of https://github.com/OpenMW/openmw into osg	2015-06-16 19:53:41 +02:00
datafilespage.cpp	Silence -Wreorder warnings.	2015-04-28 18:48:02 -05:00
datafilespage.hpp
graphicspage.cpp	Merge branch 'master' of https://github.com/OpenMW/openmw into osg	2015-05-23 20:33:44 +02:00
graphicspage.hpp	Remove OgreInit	2015-05-01 21:49:36 +02:00
main.cpp	Remove QTextCodec::setCodecForCStrings	2015-06-12 02:00:06 +02:00
maindialog.cpp	Merge branch 'master' of https://github.com/OpenMW/openmw into osg	2015-06-16 19:53:41 +02:00
maindialog.hpp	removed a redundant typedef	2015-05-17 10:38:15 +02:00
playpage.cpp
playpage.hpp
settingspage.cpp	Revert "Allow comments (lines starting with # character) and blank lines in openmw.cfg. Should resolve Feature #2535."	2015-06-13 23:50:12 +02:00
settingspage.hpp
textslotmsgbox.cpp
textslotmsgbox.hpp