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
@@ -25,8 +25,6 @@
 #include <QList>
 #include <QPainter>

-#include "Merge.h"
-#include "MergeRecord.h"
 #include "libglabels/Template.h"
 #include "Settings.h"

@@ -35,6 +33,8 @@
 class LabelModelObject;
 class Handle;
 class LabelRegion;
+class Merge;
+class MergeRecord;
 class ColorNode;