diff options
| author | kh1 <qt-info@nokia.com> | 2011-05-16 20:49:49 +0200 |
|---|---|---|
| committer | kh1 <qt-info@nokia.com> | 2011-05-16 20:49:49 +0200 |
| commit | 44cff55378c5a680457e2c804fa51eee4c82e3fd (patch) | |
| tree | b48989ede66707650dc723e3483877546ec698e1 /installerbuilder/libinstaller/globalsettingsoperation.h | |
| parent | 367477f07449f25cdfbd2c1d4274df698f279a21 (diff) | |
| parent | 6391f4a773c66b768f70133e628544db0af67a58 (diff) | |
Merge branch 'master' into refactor
Conflicts:
installerbuilder/libinstaller/libinstaller.pri
installerbuilder/libinstaller/libinstaller.pro
installerbuilder/libinstaller/registertoolchainoperation.cpp
Diffstat (limited to 'installerbuilder/libinstaller/globalsettingsoperation.h')
| -rw-r--r-- | installerbuilder/libinstaller/globalsettingsoperation.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/installerbuilder/libinstaller/globalsettingsoperation.h b/installerbuilder/libinstaller/globalsettingsoperation.h index 693273d39..82cf3cd2f 100644 --- a/installerbuilder/libinstaller/globalsettingsoperation.h +++ b/installerbuilder/libinstaller/globalsettingsoperation.h @@ -48,5 +48,6 @@ private: QSettingsWrapper* setup(QString *key, QString *value, const QStringList &args); }; -}; // namespace +} // namespace + #endif // GLOBALSETTINGSOPERATION_H |