Marc Zinnschlag 9cf793c0b5 silenced a warning		2015-08-25 11:39:43 +02:00
..
model	silenced a warning	2015-08-25 11:39:43 +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