Merge remote branch 'origin/2.1'

This commit is contained in:
Friedemann Kleint
2010-10-27 11:05:31 +02:00
40 changed files with 26000 additions and 7598 deletions

View File

@@ -156,7 +156,7 @@ public:
bool renameFile(const FileType fileType,
const QString &filePath, const QString &newFilePath);
void folderChanged(const QString &folder);
void folderChanged(const QString &changedFolder);
bool deploysFolder(const QString &folder) const;