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
+3 -3
View File
@@ -21,9 +21,9 @@
#include "PageRenderer.h"
#include "LabelModel.h"
#include "Merge.h"
#include "MergeNone.h"
#include "MergeRecord.h"
#include "Merge/Merge.h"
#include "Merge/MergeNone.h"
#include "Merge/MergeRecord.h"
#include <QPainter>
#include <QtDebug>