| commit | e35fc43e7aa347e298d91e5afefefc7c6bb69553 | |
| author | Chris Frey <cdfrey@foursquare.net> | |
| Fri, 2 Apr 2010 10:04:47 +0000 (2 06:04 -0400) | ||
| committer | Chris Frey <cdfrey@foursquare.net> | |
| Thu, 10 Feb 2011 23:38:33 +0000 (10 18:38 -0500) | ||
| tree | 0be0ca91b31d19f6a653062fd6e77891979c9ea3 | treesnapshot (tar.gz zip) |
| parent | 39c019083bf98c2f0a8e64a3f151a9af8f80dd96 | commitdiff |
desktop: stop the progress bar timer when dealing with a conflict
| desktop/src/SyncStatusDlg.cc | diffblobblamehistory | |
| desktop/src/SyncStatusDlg.h | diffblobblamehistory |