diff changesetscene.cpp @ 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.cpp	Thu Dec 02 11:51:15 2010 +0000
+++ b/changesetscene.cpp	Thu Dec 02 17:55:21 2010 +0000
@@ -61,6 +61,9 @@
     
     connect(item, SIGNAL(diff()),
             this, SIGNAL(diffWorkingFolder()));
+
+    connect(item, SIGNAL(showWork()),
+            this, SIGNAL(showWork()));
 }
 
 void