1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-09 03:39:14 +00:00
OpenMW/components/config
pvdk c54217d008 Merge remote-tracking branch 'upstream/master' into HEAD
Conflicts:
	CMakeLists.txt
	components/CMakeLists.txt
	components/config/gamesettings.cpp
2014-02-19 19:26:07 +01:00
..
gamesettings.cpp Merge remote-tracking branch 'upstream/master' into HEAD 2014-02-19 19:26:07 +01:00
gamesettings.hpp Merge remote-tracking branch 'upstream/master' into HEAD 2014-02-19 19:26:07 +01:00
launchersettings.cpp
launchersettings.hpp
settingsbase.hpp