graffy76 f87eb67968 Fixed conflicts ...

Merge branch 'cs-windows' of https://github.com/Glorf/openmw

Conflicts:
	apps/opencs/model/settings/usersettings.cpp
	apps/opencs/model/settings/usersettings.hpp
	apps/opencs/view/settings/usersettingsdialog.cpp

2013-06-17 06:45:44 -05:00

2.1 KiB

48x48px

Raw History