diff options
| author | con <qtc-committer@nokia.com> | 2009-06-03 11:36:49 +0200 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2009-06-03 11:36:49 +0200 |
| commit | 2ac1f797ad00b2d056ad81b826a2a8ba6edf2361 (patch) | |
| tree | 9f730dab641861c3012383dcaa3e89b0e81550e1 /src/libs/cplusplus/cplusplus-lib.pri | |
| parent | 313cb44e1d2b9eca7e801712ea77fbc09dedcde8 (diff) | |
| parent | 7b1655049ac9a77959bb849cd3d26eb18e8e9163 (diff) | |
| download | qt-creator-2ac1f797ad00b2d056ad81b826a2a8ba6edf2361.tar.gz | |
Merge commit 'origin/1.2'
Conflicts:
src/plugins/coreplugin/welcomemode.ui
Diffstat (limited to 'src/libs/cplusplus/cplusplus-lib.pri')
0 files changed, 0 insertions, 0 deletions