scrawl e1f4a7f647 Merge branch 'master' of https://github.com/OpenMW/openmw into osg ... Conflicts: apps/openmw/engine.cpp apps/openmw/mwgui/mainmenu.cpp apps/openmw/mwgui/windowmanagerimp.cpp apps/openmw/mwinput/inputmanagerimp.cpp apps/openmw/mwrender/animation.cpp apps/openmw/mwrender/debugging.cpp apps/openmw/mwrender/npcanimation.cpp apps/openmw/mwrender/renderingmanager.cpp apps/openmw/mwrender/sky.cpp components/nif/nifkey.hpp components/nif/nifstream.hpp components/nifbullet/bulletnifloader.cpp components/nifogre/ogrenifloader.hpp libs/openengine/bullet/physic.cpp libs/openengine/gui/manager.cpp		2015-05-04 02:41:50 +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	Rename omwlauncher -> openmw-launcher, mwiniimport -> openmw-iniimporter	2015-01-31 22:40:38 +01: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	Remove OgreInit	2015-05-01 21:49:36 +02:00
graphicspage.hpp	Remove OgreInit	2015-05-01 21:49:36 +02:00
main.cpp	QString encoding fix	2015-02-09 20:15:41 +01:00
maindialog.cpp	Silence -Wreorder warnings.	2015-04-28 18:48:02 -05:00
maindialog.hpp	Cleaned up old wizard stuff from launcher	2014-05-29 17:57:41 +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	Fix: no longer loose changes when run install wizard or iniimport.	2015-02-24 20:14:18 +13: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