Moved Merge subsystem into its own subdirectory.

2016-05-22 13:01:48 -04:00
parent 691353e27b
commit b1e7a6507c
26 changed files with 141 additions and 30 deletions
@@ -26,6 +26,8 @@
 #include "LabelModelBoxObject.h"
 #include "UndoRedoModel.h"

+#include "Merge/Merge.h"
+
 #include "Settings.h"

 #include <cmath>