Mercurial > hg > easyhg
comparison historywidget.h @ 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 | 5b4aa1c24407 |
comparison
equal
deleted
inserted
replaced
287:3fbafca196e4 | 296:d40294e164da |
---|---|
52 void showSummary(); | 52 void showSummary(); |
53 void showWork(); | 53 void showWork(); |
54 | 54 |
55 void updateTo(QString id); | 55 void updateTo(QString id); |
56 void diffToParent(QString id, QString parent); | 56 void diffToParent(QString id, QString parent); |
57 void showSummary(Changeset *); | |
57 void diffToCurrent(QString id); | 58 void diffToCurrent(QString id); |
58 void mergeFrom(QString id); | 59 void mergeFrom(QString id); |
59 void tag(QString id); | 60 void tag(QString id); |
60 | 61 |
61 private: | 62 private: |