scrawl cad18969e3 Merge branch 'master' of https://github.com/OpenMW/openmw into osg ... Conflicts: apps/openmw/mwmechanics/aicombat.cpp apps/openmw/mwmechanics/aitravel.cpp		2015-06-14 16:32:13 +02:00
..
settings
utils
CMakeLists.txt	Merge branch 'master' of https://github.com/OpenMW/openmw into osg	2015-06-13 21:11:24 +02:00
datafilespage.cpp
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
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-14 16:32:13 +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