Marc Zinnschlag 0b8e04d6a8 forgot to connect merge operation signals ...

(cherry picked from commit d8655f2ff862dbaf90fb285ef01cdf6891cdbea6)

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

..

model

forgot to connect merge operation signals

2015-11-01 13:25:59 +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