Marc Zinnschlag 23ccee0124 Merge remote-tracking branch 'dieho/master' ... Conflicts: apps/opencs/view/world/dialoguesubview.cpp		2015-08-08 11:00:44 +02:00
..
model	Merge remote-tracking branch 'dieho/master'	2015-08-08 11:00:44 +02:00
view	Merge remote-tracking branch 'dieho/master'	2015-08-08 11:00:44 +02:00
CMakeLists.txt	Add magic effect verifier	2015-08-03 19:08:01 +03:00
editor.cpp	Merge branch 'master' of https://github.com/OpenMW/openmw into osg	2015-06-16 19:53:41 +02:00
editor.hpp	Merge branch 'master' of https://github.com/OpenMW/openmw into osg	2015-06-16 19:53:41 +02:00
main.cpp	Merge branch 'master' of https://github.com/OpenMW/openmw into osg	2015-06-22 20:09:02 +02:00