Marc Zinnschlag d8655f2ff8 forgot to connect merge operation signals

2015-08-13 14:49:32 +02:00

..

model

forgot to connect merge operation signals

2015-08-13 14:49:32 +02: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-08-13 12:53:00 +02:00

CMakeLists.txt

added merge operation (doesn't do anything yet)

2015-08-13 12:03:20 +02: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-08-13 12:53:00 +02:00

editor.hpp

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

2015-08-06 12:52:10 +02:00

main.cpp

Merge branch 'master' of https://github.com/OpenMW/openmw into osg

2015-06-22 20:09:02 +02:00