Marc Zinnschlag 54f56b0515 Merge remote-tracking branch 'graffy76/usersettings' ... Conflicts: apps/opencs/view/doc/view.cpp apps/opencs/view/doc/view.hpp		2013-05-16 18:04:55 +02:00
..
gamesettings.cpp
gamesettings.hpp
graphicssettings.cpp
graphicssettings.hpp
launchersettings.cpp
launchersettings.hpp
settingsbase.hpp	Merge remote-tracking branch 'graffy76/usersettings'	2013-05-16 18:04:55 +02:00