3 commits

Author	SHA1	Message	Date
Marc Zinnschlag	e2377396a7	inheriting Merge from QWidget instead of QDialog, because QDialog is bloody useless for non-modal dialogues (which makes the class completely useless, since modal dialogues are the spawn of Satan)	2015-08-13 12:53:00 +02:00
Marc Zinnschlag	904ad94952	added merge operation (doesn't do anything yet)	2015-08-13 12:03:20 +02:00
Marc Zinnschlag	b83f9445a9	added UI for merge tool (merge tool itself is still missing)	2015-08-06 12:52:10 +02:00