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 e2377396a7cf7b9cd1ec91e0f385721a124a49cc)

2015-11-01 13:25:46 +11:00

..

model

added merge operation (doesn't do anything yet)

2015-11-01 13:25:34 +11:00

view

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-11-01 13:25:46 +11:00

CMakeLists.txt

added merge operation (doesn't do anything yet)

2015-11-01 13:25:34 +11:00

editor.cpp

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-11-01 13:25:46 +11:00

editor.hpp

added UI for merge tool (merge tool itself is still missing)

2015-11-01 13:22:42 +11:00

main.cpp

Remove empty line at the beginning of files

2015-09-08 06:40:06 +10:00