comparison mainwindow.h @ 293:7b4f42cfc596

Merge from branch "more_information_dialog"
author Chris Cannam
date Mon, 21 Feb 2011 18:17:18 +0000
parents 37f67999b661 1244dc3107cb
children d40294e164da
comparison
equal deleted inserted replaced
292:a1c8630a0057 293:7b4f42cfc596
140 140
141 void showIncoming(QString); 141 void showIncoming(QString);
142 void showPullResult(QString); 142 void showPullResult(QString);
143 void showPushResult(QString); 143 void showPushResult(QString);
144 int extractChangeCount(QString); 144 int extractChangeCount(QString);
145 QString format1(QString);
145 QString format3(QString, QString, QString); 146 QString format3(QString, QString, QString);
146 147
147 void clearState(); 148 void clearState();
148 149
149 void updateFileSystemWatcher(); 150 void updateFileSystemWatcher();