diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2010-08-06 10:46:50 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2010-08-06 10:46:50 +0200 |
| commit | 7e739985b25b16af504adb280685c961afbcbcc8 (patch) | |
| tree | 4bd678eaaac49ed580d2ad091c218961a5d08081 /src/shared/cplusplus/CheckDeclaration.cpp | |
| parent | 077c9181863e0036ae16772530cd2624af9e7b78 (diff) | |
| parent | 9bad0c01bec3547324bf9340497fb956467a9531 (diff) | |
| download | qt-creator-7e739985b25b16af504adb280685c961afbcbcc8.tar.gz | |
Merge remote branch 'origin/2.0'
Conflicts:
src/plugins/debugger/debuggeruiswitcher.cpp
src/plugins/git/gitclient.cpp
src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
Diffstat (limited to 'src/shared/cplusplus/CheckDeclaration.cpp')
0 files changed, 0 insertions, 0 deletions