Moved Merge subsystem into merge namespace.

2016-05-22 14:38:59 -04:00
parent b1e7a6507c
commit c7f02f027a
34 changed files with 1434 additions and 1380 deletions
@@ -10,12 +10,12 @@ project (Merge CXX)
 # Sources
 #=======================================
 set (merge_sources
+  Factory.cpp
+  Record.cpp
  Merge.cpp
-  MergeFactory.cpp
-  MergeRecord.cpp
-  MergeNone.cpp
-  MergeText.cpp
-  MergeTextCsv.cpp
+  None.cpp
+  Text.cpp
+  TextCsv.cpp
 )

 set (merge_qobject_headers