diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-01-17 09:30:57 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-01-17 09:30:57 +0100 |
| commit | 115afed94b8e85db29b0c057e7c143a3d053d6cc (patch) | |
| tree | 7663d95ed448c963ab8b913b675a78f0dea65fdc /src/plugins/cpptools/cpptoolsplugin.cpp | |
| parent | 76bc20ffceadfff894dfd98a0285ae52577be3bf (diff) | |
| parent | 2765409d2bdc79753f96bf6bb894b2884ac5b0cd (diff) | |
| download | qt-creator-115afed94b8e85db29b0c057e7c143a3d053d6cc.tar.gz | |
Merge remote-tracking branch 'origin/4.6'
Conflicts:
tests/unit/unittest/gtest-creator-printing.cpp
tests/unit/unittest/gtest-creator-printing.h
Change-Id: I43d2571617bfbf41c0fcf23502ab77975540eba4
Diffstat (limited to 'src/plugins/cpptools/cpptoolsplugin.cpp')
0 files changed, 0 insertions, 0 deletions