comparison 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
comparison
equal deleted inserted replaced
287:3fbafca196e4 296:d40294e164da
275 this, SIGNAL(diffToCurrent(QString))); 275 this, SIGNAL(diffToCurrent(QString)));
276 276
277 connect(scene, SIGNAL(diffToParent(QString, QString)), 277 connect(scene, SIGNAL(diffToParent(QString, QString)),
278 this, SIGNAL(diffToParent(QString, QString))); 278 this, SIGNAL(diffToParent(QString, QString)));
279 279
280 connect(scene, SIGNAL(showSummary(Changeset *)),
281 this, SIGNAL(showSummary(Changeset *)));
282
280 connect(scene, SIGNAL(mergeFrom(QString)), 283 connect(scene, SIGNAL(mergeFrom(QString)),
281 this, SIGNAL(mergeFrom(QString))); 284 this, SIGNAL(mergeFrom(QString)));
282 285
283 connect(scene, SIGNAL(tag(QString)), 286 connect(scene, SIGNAL(tag(QString)),
284 this, SIGNAL(tag(QString))); 287 this, SIGNAL(tag(QString)));