Merge remote branch 'origin/1.3'

Trailing whitespace removal re-applied manually.
This commit is contained in:
Oswald Buddenhagen
2010-01-29 22:49:55 +01:00
302 changed files with 940 additions and 940 deletions

View File

@@ -55,7 +55,7 @@ struct CppFileSettings {
void toSettings(QSettings *) const;
void fromSettings(QSettings *);
bool applySuffixesToMimeDB();
bool applySuffixesToMimeDB();
// Convenience to return a license template completely formatted.
// Currently made public in
@@ -79,7 +79,7 @@ public:
QString searchKeywords() const;
private slots:
private slots:
void slotEdit();
private: