comparison hgtabwidget.cpp @ 296:d40294e164da status_outside_tabs

Merge from the default branch
author Chris Cannam
date Tue, 22 Feb 2011 13:03:03 +0000
parents 3fbafca196e4 37f67999b661
children 5b4aa1c24407
comparison
equal deleted inserted replaced
287:3fbafca196e4 296:d40294e164da
65 this, SIGNAL(diffToCurrent(QString))); 65 this, SIGNAL(diffToCurrent(QString)));
66 66
67 connect(m_historyWidget, SIGNAL(diffToParent(QString, QString)), 67 connect(m_historyWidget, SIGNAL(diffToParent(QString, QString)),
68 this, SIGNAL(diffToParent(QString, QString))); 68 this, SIGNAL(diffToParent(QString, QString)));
69 69
70 connect(m_historyWidget, SIGNAL(showSummary(Changeset *)),
71 this, SIGNAL(showSummary(Changeset *)));
72
70 connect(m_historyWidget, SIGNAL(mergeFrom(QString)), 73 connect(m_historyWidget, SIGNAL(mergeFrom(QString)),
71 this, SIGNAL(mergeFrom(QString))); 74 this, SIGNAL(mergeFrom(QString)));
72 75
73 connect(m_historyWidget, SIGNAL(tag(QString)), 76 connect(m_historyWidget, SIGNAL(tag(QString)),
74 this, SIGNAL(tag(QString))); 77 this, SIGNAL(tag(QString)));