Mercurial > hg > easyhg
diff historywidget.cpp @ 296:d40294e164da status_outside_tabs
Merge from the default branch
author | Chris Cannam |
---|---|
date | Tue, 22 Feb 2011 13:03:03 +0000 |
parents | 37f67999b661 |
children | 7708149d252a |
line wrap: on
line diff
--- a/historywidget.cpp Mon Feb 21 11:07:21 2011 +0000 +++ b/historywidget.cpp Tue Feb 22 13:03:03 2011 +0000 @@ -277,6 +277,9 @@ connect(scene, SIGNAL(diffToParent(QString, QString)), this, SIGNAL(diffToParent(QString, QString))); + connect(scene, SIGNAL(showSummary(Changeset *)), + this, SIGNAL(showSummary(Changeset *))); + connect(scene, SIGNAL(mergeFrom(QString)), this, SIGNAL(mergeFrom(QString)));