diff changesetscene.h @ 153:70fe12873106

* Show both parents of uncommitted merge; fixes to right-button menus
author Chris Cannam
date Thu, 02 Dec 2010 17:55:21 +0000
parents 2fef6b0dfbe8
children 4bad3c5c053a
line wrap: on
line diff
--- a/changesetscene.h	Thu Dec 02 11:51:15 2010 +0000
+++ b/changesetscene.h	Thu Dec 02 17:55:21 2010 +0000
@@ -37,6 +37,7 @@
     void commit();
     void revert();
     void diffWorkingFolder();
+    void showWork();
 
     void updateTo(QString id);
     void diffToParent(QString id, QString parent);