diff options
| author | hjk <qtc-committer@nokia.com> | 2010-08-13 11:19:44 +0200 |
|---|---|---|
| committer | hjk <qtc-committer@nokia.com> | 2010-08-13 11:19:44 +0200 |
| commit | 64e4a8f7ae3e0519a53f11af8d28071ba2ac7313 (patch) | |
| tree | 2dc0a20f3c4e66219941307d1aa4e583d3fca1c9 /src/shared/cplusplus | |
| parent | b50619066a59e5125a5ebc5f2f8bbc901a9a771b (diff) | |
| parent | b44efd097b03a89d1df1fd77b871ff5a238f66c5 (diff) | |
| download | qt-creator-64e4a8f7ae3e0519a53f11af8d28071ba2ac7313.tar.gz | |
Merge remote branch 'origin/2.0'
Conflicts:
share/qtcreator/gdbmacros/dumper.py
share/qtcreator/gdbmacros/gdbmacros.py
src/plugins/projectexplorer/customwizard/customwizardparameters.cpp
Diffstat (limited to 'src/shared/cplusplus')
0 files changed, 0 insertions, 0 deletions