diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-02-08 12:48:19 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-02-08 12:48:19 +0100 |
| commit | 67b3d256249e5001bfdc99a4f2c4e233d8632659 (patch) | |
| tree | 1ceae8abc7166b96e5a54777ecb87dd5f0fc311d /src/plugins/cpptools/cppcompletionassist.h | |
| parent | 7c61cc31512a7e4a5d22a2cc14eeb351f0eacc71 (diff) | |
| parent | d07d75a08af17305d317b363a7d3044ebeb54a2c (diff) | |
| download | qt-creator-67b3d256249e5001bfdc99a4f2c4e233d8632659.tar.gz | |
Merge remote-tracking branch 'origin/4.9'
Conflicts:
qtcreator.pri
Change-Id: I278bc79cb64705471b360d0b8d06a8db17db7904
Diffstat (limited to 'src/plugins/cpptools/cppcompletionassist.h')
0 files changed, 0 insertions, 0 deletions