Mercurial > hg > easyhg
comparison hgtabwidget.h @ 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 |
|---|---|
| 88 void diffWorkingFolder(); | 88 void diffWorkingFolder(); |
| 89 void showSummary(); | 89 void showSummary(); |
| 90 | 90 |
| 91 void updateTo(QString id); | 91 void updateTo(QString id); |
| 92 void diffToParent(QString id, QString parent); | 92 void diffToParent(QString id, QString parent); |
| 93 void showSummary(Changeset *); | |
| 93 void diffToCurrent(QString id); | 94 void diffToCurrent(QString id); |
| 94 void mergeFrom(QString id); | 95 void mergeFrom(QString id); |
| 95 void tag(QString id); | 96 void tag(QString id); |
| 96 | 97 |
| 97 public slots: | 98 public slots: |