Added Merge base class.

2015-09-26 10:45:49 -04:00
parent 5daa902430
commit cf1c194928
4 changed files with 287 additions and 4 deletions
@@ -30,6 +30,7 @@ set (glabels_sources
  LabelModelShapeObject.cpp
  LabelRegion.cpp
  MainWindow.cpp
+  Merge.cpp
  MergeField.cpp
  MergePropertyEditor.cpp
  MergeRecord.cpp
@@ -67,6 +68,7 @@ set (glabels_qobject_headers
  LabelModelBoxObject.h
  LabelModelShapeObject.h
  MainWindow.h
+  Merge.h
  MergePropertyEditor.h
  NewLabelDialog.h
  ObjectEditor.h