Marc Zinnschlag 845cafd61c fixed record state issues after merge		2015-08-25 12:40:40 +02:00
..
model	fixed record state issues after merge	2015-08-25 12:40:40 +02:00
view	create merged document and open a view for it (document is still empty at this point)	2015-08-16 15:24:48 +02:00
CMakeLists.txt	create merged document and open a view for it (document is still empty at this point)	2015-08-16 15:24:48 +02:00
editor.cpp	create merged document and open a view for it (document is still empty at this point)	2015-08-16 15:24:48 +02:00
editor.hpp	added UI for merge tool (merge tool itself is still missing)	2015-08-06 12:52:10 +02:00
main.cpp	Merge branch 'master' of https://github.com/OpenMW/openmw into osg	2015-06-22 20:09:02 +02:00