comparison filestatuswidget.h @ 362:73fb5ef55744

Merge from branch "feature_91b". Really fixes #91
author Chris Cannam
date Thu, 17 Mar 2011 17:34:40 +0000
parents 4cd753e083cc
children
comparison
equal deleted inserted replaced
360:f34848e8094b 362:73fb5ef55744
60 60
61 void annotateFiles(QStringList); 61 void annotateFiles(QStringList);
62 void diffFiles(QStringList); 62 void diffFiles(QStringList);
63 void commitFiles(QStringList); 63 void commitFiles(QStringList);
64 void revertFiles(QStringList); 64 void revertFiles(QStringList);
65 void renameFiles(QStringList);
66 void copyFiles(QStringList);
65 void addFiles(QStringList); 67 void addFiles(QStringList);
66 void removeFiles(QStringList); 68 void removeFiles(QStringList);
67 void redoFileMerges(QStringList); 69 void redoFileMerges(QStringList);
68 void markFilesResolved(QStringList); 70 void markFilesResolved(QStringList);
69 void ignoreFiles(QStringList); 71 void ignoreFiles(QStringList);