Fleshing out of using merge for colors.

2016-05-17 23:31:52 -04:00
parent d7480f9bb8
commit 669c1d02e7
16 changed files with 87 additions and 25 deletions
@@ -76,7 +76,7 @@ Merge* MergeNone::create()
 ///
 /// Get key list
 ///
-QStringList MergeNone::keyList() const
+QStringList MergeNone::keys() const
 {
 	QStringList emptyList;
 	return emptyList;