Marc Zinnschlag 708cacdec4 disable merge menu item when a merge is already in progress		2015-08-08 16:47:58 +02:00
..
model	added UI for merge tool (merge tool itself is still missing)	2015-08-06 12:52:10 +02:00
view	disable merge menu item when a merge is already in progress	2015-08-08 16:47:58 +02:00
CMakeLists.txt	added UI for merge tool (merge tool itself is still missing)	2015-08-06 12:52:10 +02:00
editor.cpp	added UI for merge tool (merge tool itself is still missing)	2015-08-06 12:52:10 +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