More fleshing out of merge framework.

2016-05-08 00:43:35 -04:00
parent 88e32d9738
commit 37358aac43
13 changed files with 193 additions and 37 deletions
@@ -49,6 +49,7 @@ protected:
 	// Static methods
 	/////////////////////////////////
 public:
+	static QString id();
 	static Merge* create();