diff options
| author | hjk <qtc-committer@nokia.com> | 2010-05-27 11:11:53 +0200 |
|---|---|---|
| committer | hjk <qtc-committer@nokia.com> | 2010-05-27 11:11:53 +0200 |
| commit | 5805788290ee5a3ac85afe87aa6543e77d51bcdc (patch) | |
| tree | 775f8aaf8c5b346ad2be67953e2962ca99fc7d64 /src/shared/cplusplus/Parser.cpp | |
| parent | 125aaf861505176a7d8acc8ca36ca0094862785d (diff) | |
| parent | 0b52a873bda41c35ab640deadd6f30a3aa903ac7 (diff) | |
| download | qt-creator-5805788290ee5a3ac85afe87aa6543e77d51bcdc.tar.gz | |
Merge remote branch 'origin/2.0'
Conflicts:
src/plugins/projectexplorer/miniprojecttargetselector.cpp
src/plugins/qmldesigner/designercore/model/modeltotextmerger.cpp
src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp
src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp
src/plugins/qt4projectmanager/qt-maemo/maemosshthread.h
tests/manual/gdbdebugger/simple/app.cpp
Diffstat (limited to 'src/shared/cplusplus/Parser.cpp')
0 files changed, 0 insertions, 0 deletions