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
@@ -20,7 +20,7 @@

 #include "ColorNode.h"

-#include "Merge/MergeRecord.h"
+#include "Merge/Record.h"


 ///
@@ -160,7 +160,7 @@ uint32_t ColorNode::rgba( void ) const
 }

 	
-QColor ColorNode::color( MergeRecord* record ) const
+QColor ColorNode::color( merge::Record* record ) const
 {
 	if ( mFieldFlag )
 	{