diff options
| author | ck <qt-info@nokia.com> | 2009-10-23 09:41:14 +0200 |
|---|---|---|
| committer | ck <qt-info@nokia.com> | 2009-10-23 09:41:14 +0200 |
| commit | 0edf1b48a6ea3e2271c21f97d573b649b4ca9a12 (patch) | |
| tree | 3c8ce158ddc800009fa32383615757927c76be5b /src/shared/cplusplus/Control.cpp | |
| parent | 7df5226e42ef1991110a41d50ece908bfe07d637 (diff) | |
| parent | 4504aec7deb2f0abcd6a71e094bbcfb4edd5154d (diff) | |
| download | qt-creator-0edf1b48a6ea3e2271c21f97d573b649b4ca9a12.tar.gz | |
Merge branch 'master' of scm.dev.nokia.troll.no:creator/mainline
Conflicts:
src/plugins/qt4projectmanager/qtversionmanager.cpp
Diffstat (limited to 'src/shared/cplusplus/Control.cpp')
0 files changed, 0 insertions, 0 deletions