mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-22 23:54:01 +00:00
Code Issues Releases Wiki Activity
6137 commits 108 branches 66 tags 133 MiB
Commit graph

2 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
6faf6f57e1 Added settings file reader/writers for openmw.cfg and settings.cfg 2013-01-25 05:19:06 +01:00