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
..
model	Fixed conflicts	2013-06-17 06:45:44 -05:00
view	Fixed conflicts	2013-06-17 06:45:44 -05:00
CMakeLists.txt	Fixed conflicts	2013-06-17 06:45:44 -05:00
editor.cpp	Globalization of user settings	2013-06-12 12:36:35 +02:00
editor.hpp	Globalization of user settings	2013-06-12 12:36:35 +02:00
main.cpp	fix for the opencs icon	2013-02-17 07:46:50 -06:00
ocspropertywidget.cpp	update for master	2013-05-07 20:33:42 -05:00
ocspropertywidget.hpp	update for master	2013-05-07 20:33:42 -05:00