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
..
raster	Colored status icons. Hopefully everybody loves watercolors!	2013-05-31 11:50:03 +02:00
scalable	Colored status icons. Hopefully everybody loves watercolors!	2013-05-31 11:50:03 +02:00
added.png	Fixed conflicts	2013-06-17 06:45:44 -05:00
modified.png	Fixed conflicts	2013-06-17 06:45:44 -05:00
opencs.png	fix for the opencs icon	2013-02-17 07:46:50 -06:00
removed.png	Fixed conflicts	2013-06-17 06:45:44 -05:00
resources.qrc	Final details implemented	2013-05-29 06:38:35 -05:00