You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

scrawl f70250a296 Merge branch 'master' of https://github.com/OpenMW/openmw into osg ... Conflicts: apps/launcher/CMakeLists.txt apps/opencs/CMakeLists.txt apps/opencs/view/render/worldspacewidget.cpp apps/openmw/CMakeLists.txt components/CMakeLists.txt extern/osg-ffmpeg-videoplayer/CMakeLists.txt		10 years ago
..
settings	the same for data-local entry	11 years ago
utils	Fix some memory leaks	10 years ago
CMakeLists.txt	Merge branch 'master' of https://github.com/OpenMW/openmw into osg	10 years ago
datafilespage.cpp	Silence -Wreorder warnings.	10 years ago
datafilespage.hpp	Fixed typo in comment.	10 years ago
graphicspage.cpp	Merge branch 'master' of https://github.com/OpenMW/openmw into osg	10 years ago
graphicspage.hpp	Remove OgreInit	10 years ago
main.cpp	Remove QTextCodec::setCodecForCStrings	10 years ago
maindialog.cpp	Merge branch 'master' of https://github.com/OpenMW/openmw into osg	10 years ago
maindialog.hpp	removed a redundant typedef	10 years ago
playpage.cpp	Implemented Launcher namespace	11 years ago
playpage.hpp	Implemented Launcher namespace	11 years ago
settingspage.cpp	Remove user preference setting option.	10 years ago
settingspage.hpp	Morrowind.ini import progress bar. (Fixes #2344)	10 years ago
textslotmsgbox.cpp	Implemented Launcher namespace	11 years ago
textslotmsgbox.hpp	Implemented Launcher namespace	11 years ago