1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-06 00:55:50 +00:00
OpenMW/components/config
pvdk 38d825b004 Merge remote-tracking branch 'upstream/master' into wizard
Conflicts:
	CMakeLists.txt
	apps/launcher/maindialog.cpp
2014-05-29 16:42:16 +02:00
..
gamesettings.cpp Merge remote-tracking branch 'upstream/master' into wizard 2014-05-29 16:42:16 +02:00
gamesettings.hpp
launchersettings.cpp
launchersettings.hpp
settingsbase.hpp