diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2012-12-14 08:20:49 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2012-12-14 08:20:49 +0100 |
| commit | a8a33b9a3b2bab7660a53919bfbfa011e31755d3 (patch) | |
| tree | 0d091c18a3e3b666c91d6562ce6f59400a997362 /src/plugins/cpptools/cppfindreferences.cpp | |
| parent | fe6be533bc8942617d3a7a7b6b554b5298b492b7 (diff) | |
| parent | 6d83dda6df643eca4c720cb474cc5636d8e60ff5 (diff) | |
| download | qt-creator-a8a33b9a3b2bab7660a53919bfbfa011e31755d3.tar.gz | |
Merge remote-tracking branch 'origin/2.6'
Conflicts:
src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
src/plugins/qtsupport/baseqtversion.cpp
Change-Id: I288eeb1137e1b08d6c0d69f394cbb0fe1a937b68
Diffstat (limited to 'src/plugins/cpptools/cppfindreferences.cpp')
0 files changed, 0 insertions, 0 deletions