scrawl e66e9916db Merge branch 'master' of https://github.com/OpenMW/openmw into osg ... Conflicts: apps/opencs/CMakeLists.txt apps/opencs/model/doc/document.cpp apps/opencs/model/doc/document.hpp		2015-06-07 15:23:54 +02:00
..
settings	the same for data-local entry	2014-05-22 01:13:27 +04:00
utils	Fix some memory leaks	2014-12-23 20:44:25 +01:00
CMakeLists.txt	Register Player in the PhysicsSystem	2015-05-12 17:40:42 +02:00
datafilespage.cpp	Silence -Wreorder warnings.	2015-04-28 18:48:02 -05:00
datafilespage.hpp	Fixed typo in comment.	2015-02-06 12:45:15 +13:00
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	Fix #2557	2015-05-16 13:18:04 +03:00
maindialog.cpp	Merge branch 'master' of https://github.com/OpenMW/openmw into osg	2015-06-07 15:23:54 +02:00
maindialog.hpp	removed a redundant typedef	2015-05-17 10:38:15 +02:00
playpage.cpp	Implemented Launcher namespace	2013-10-25 11:17:26 -05:00
playpage.hpp	Implemented Launcher namespace	2013-10-25 11:17:26 -05:00
settingspage.cpp	Remove user preference setting option.	2015-06-07 13:29:45 +10:00
settingspage.hpp	Morrowind.ini import progress bar. (Fixes #2344)	2015-02-22 08:46:12 +13:00
textslotmsgbox.cpp	Implemented Launcher namespace	2013-10-25 11:17:26 -05:00
textslotmsgbox.hpp	Implemented Launcher namespace	2013-10-25 11:17:26 -05:00