6 Commits

Author	SHA1	Message	Date
Andrei Kortunov	8084a336b5	Replace zeroes and nulls by nullptrs	2020-11-29 11:14:07 +04:00
Andrei Kortunov	8ca3c3b123	Mark overrided methods by override keyword	2020-10-16 22:18:54 +04:00
mp3butcher	9de6c630f2	fix moc achieving to reach unparsable boost code	2018-12-01 21:27:43 +01:00
Marc Zinnschlag	1b663f01af	create merged document and open a view for it (document is still empty at this point)	2015-08-16 15:24:48 +02:00
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	b83f9445a9	added UI for merge tool (merge tool itself is still missing)	2015-08-06 12:52:10 +02:00