diff historywidget.cpp @ 312:f98c8ece3035

Merge from branch "new-branches-with-status-outside-tabs"
author Chris Cannam
date Tue, 01 Mar 2011 14:22:53 +0000
parents 4811eb34e819
children
line wrap: on
line diff
--- a/historywidget.cpp	Mon Feb 28 17:35:55 2011 +0000
+++ b/historywidget.cpp	Tue Mar 01 14:22:53 2011 +0000
@@ -268,6 +268,12 @@
 
     connect(scene, SIGNAL(showWork()),
             this, SIGNAL(showWork()));
+
+    connect(scene, SIGNAL(newBranch()),
+            this, SIGNAL(newBranch()));
+
+    connect(scene, SIGNAL(noBranch()),
+            this, SIGNAL(noBranch()));
     
     connect(scene, SIGNAL(updateTo(QString)),
             this, SIGNAL(updateTo(QString)));
@@ -284,6 +290,9 @@
     connect(scene, SIGNAL(mergeFrom(QString)),
             this, SIGNAL(mergeFrom(QString)));
 
+    connect(scene, SIGNAL(newBranch(QString)),
+            this, SIGNAL(newBranch(QString)));
+
     connect(scene, SIGNAL(tag(QString)),
             this, SIGNAL(tag(QString)));
 }