diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-03-19 13:13:31 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-03-19 13:13:31 +0100 |
| commit | 7ba225cb79c2d83bf7ed5dd249747541dd27a963 (patch) | |
| tree | 7afe909d92805ab0233dddb4bc796596a74df878 /src/plugins/cpptools/cpprefactoringengine.cpp | |
| parent | 67e5eabc4af630c02ab15700f596b131c70b6ed8 (diff) | |
| parent | cabbeb1c5450b67ba649d77474b892d5acb0d622 (diff) | |
| download | qt-creator-7ba225cb79c2d83bf7ed5dd249747541dd27a963.tar.gz | |
Merge remote-tracking branch 'origin/4.6'
Conflicts:
qbs/modules/qtc/qtc.qbs
qtcreator.pri
Change-Id: Ifd9524b0155067faf9d8a90858cc5f7da6b651bf
Diffstat (limited to 'src/plugins/cpptools/cpprefactoringengine.cpp')
0 files changed, 0 insertions, 0 deletions