diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-07-09 11:04:59 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-07-09 11:04:59 +0200 |
| commit | 79fbb0db047ff96aa64aefff515e43dee6fd8556 (patch) | |
| tree | e0d804f01bbf10d160b29562c662b0e339cfb20a /src/plugins/cpptools/cpptoolsplugin.cpp | |
| parent | 0d92b468b73aa2593378b0e531785ea631346e75 (diff) | |
| parent | 79c8a8fbb0ec98f2497bc2b275c2b0f215314a76 (diff) | |
| download | qt-creator-79fbb0db047ff96aa64aefff515e43dee6fd8556.tar.gz | |
Merge remote-tracking branch 'origin/2.8' into HEAD
Conflicts:
src/libs/cplusplus/FindUsages.cpp
tests/auto/cplusplus/findusages/tst_findusages.cpp
tests/auto/debugger/tst_dumpers.cpp
Change-Id: I20e2002c7b25cc25d8120922fa9b52e59db498e3
Diffstat (limited to 'src/plugins/cpptools/cpptoolsplugin.cpp')
0 files changed, 0 insertions, 0 deletions