comparison mainwindow.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 7b4f42cfc596
children 5b4aa1c24407
comparison
equal deleted inserted replaced
287:3fbafca196e4 296:d40294e164da
69 void hgStat(); 69 void hgStat();
70 void hgRemove(); 70 void hgRemove();
71 void hgAdd(); 71 void hgAdd();
72 void hgCommit(); 72 void hgCommit();
73 void hgShowSummary(); 73 void hgShowSummary();
74 void hgShowSummaryFor(Changeset *);
74 void hgFolderDiff(); 75 void hgFolderDiff();
75 void hgDiffToCurrent(QString); 76 void hgDiffToCurrent(QString);
76 void hgDiffToParent(QString, QString); 77 void hgDiffToParent(QString, QString);
77 void hgUpdate(); 78 void hgUpdate();
78 void hgRevert(); 79 void hgRevert();
141 142
142 void showIncoming(QString); 143 void showIncoming(QString);
143 void showPullResult(QString); 144 void showPullResult(QString);
144 void showPushResult(QString); 145 void showPushResult(QString);
145 int extractChangeCount(QString); 146 int extractChangeCount(QString);
147 QString format1(QString);
146 QString format3(QString, QString, QString); 148 QString format3(QString, QString, QString);
147 149
148 void clearState(); 150 void clearState();
149 151
150 void updateFileSystemWatcher(); 152 void updateFileSystemWatcher();