Moved Merge subsystem into its own subdirectory.

This commit is contained in:
Jim Evins
2016-05-22 13:01:48 -04:00
parent 691353e27b
commit b1e7a6507c
26 changed files with 141 additions and 30 deletions
+1 -1
View File
@@ -27,7 +27,7 @@
//#include "LabelObjectLine.h"
//#include "LabelObjectImage.h"
//#include "LabelObjectBarcode.h"
#include "MergeFactory.h"
#include "Merge/MergeFactory.h"
#include "libglabels/XmlTemplateParser.h"
#include "libglabels/XmlUtil.h"