2 commits

Author	SHA1	Message	Date
Marc Zinnschlag	9423603e94	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) ... (cherry picked from commit e2377396a7)	2015-11-01 13:25:46 +11:00
Marc Zinnschlag	ef1e01639e	added UI for merge tool (merge tool itself is still missing) ... (cherry picked from commit b83f9445a9) Conflicts: apps/opencs/editor.cpp apps/opencs/editor.hpp	2015-11-01 13:22:42 +11:00