mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-25 00:56:37 +00:00
Code Issues Releases Wiki Activity
6730 commits 115 branches 75 tags 128 MiB
Commit graph

3 commits

Author SHA1 Message Date
Pieter van der Kloet
ee27e3bb58 Merge remote-tracking branch 'upstream/next' into settingsnext 
Conflicts:
	apps/launcher/CMakeLists.txt
	apps/launcher/datafilespage.cpp
	apps/launcher/datafilespage.hpp
	apps/launcher/graphicspage.cpp
	components/fileorderlist/utils/filedialog.cpp
	components/fileorderlist/utils/filedialog.hpp
 2013-02-15 15:21:14 +01:00
Pieter van der Kloet
1b9cf8c23f More work on integrating the settings parser, profiles are handled correctly 2013-02-15 01:20:48 +01:00
Pieter van der Kloet
aa25471517 WIP: working on improving the config file handling 2013-02-11 15:01:00 +01:00