mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-10 06:39:49 +00:00
Code Issues Projects Releases Wiki Activity
ee27e3bb58
OpenMW/apps/launcher/settings
History
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
..
gamesettings.cpp
gamesettings.hpp
graphicssettings.cpp
graphicssettings.hpp Merge remote-tracking branch 'upstream/next' into settingsnext 2013-02-15 15:21:14 +01:00
launchersettings.cpp
launchersettings.hpp Merge remote-tracking branch 'upstream/next' into settingsnext 2013-02-15 15:21:14 +01:00
settingsbase.hpp