Seth/sethLabels
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Moved Merge subsystem into merge namespace.

Browse Source
This commit is contained in:
Jim Evins
2016-05-22 14:38:59 -04:00
parent b1e7a6507c
commit c7f02f027a
34 changed files with 1434 additions and 1380 deletions
Download Patch File Download Diff File Expand all files Collapse all files
glabels/ColorNode.h
+2 -3
View File
@@ -24,8 +24,7 @@
#include <QString>
#include <QColor>
#include <stdint.h>
class MergeRecord; // Forward reference
#include "Merge/Record.h"
///
@@ -89,7 +88,7 @@ public:
/////////////////////////////////
public:
uint32_t rgba( void ) const;
QColor color( MergeRecord* record ) const;
QColor color( merge::Record* record ) const;
/////////////////////////////////