Marc Zinnschlag c626e2b257 Merge branch 'ref' ... Conflicts: apps/opencs/view/doc/view.hpp		2013-05-19 14:59:01 +02:00
..
model	Merge branch 'ref'	2013-05-19 14:59:01 +02:00
view	Merge branch 'ref'	2013-05-19 14:59:01 +02:00
CMakeLists.txt	Merge branch 'ref'	2013-05-19 14:59:01 +02:00
editor.cpp	Merge branch 'master' of https://github.com/zinnschlag/openmw into saveOnClose	2013-03-08 20:08:56 -06:00
editor.hpp	Merge remote-tracking branch 'graffy76/usersettings'	2013-05-16 18:04:55 +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