diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2017-01-25 16:27:49 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2017-01-25 16:27:49 +0100 |
| commit | a93fc0a4fecada3a1ae0b897ff71e7f7b5b73f3b (patch) | |
| tree | 656f37741fa6a2bef17e46388da377b2cecbb79b /src/plugins/cpptools/cppmodelmanager_test.cpp | |
| parent | 3c743346b07e0a80817737580bfa6d6c556c88e2 (diff) | |
| parent | 23a2eff60dff034de15d041fca11d712bfa02922 (diff) | |
| download | qt-creator-a93fc0a4fecada3a1ae0b897ff71e7f7b5b73f3b.tar.gz | |
Merge remote-tracking branch 'origin/4.2'
Conflicts:
qbs/modules/qtc/qtc.qbs
qtcreator.pri
Change-Id: Ia6083434a811fc975696edf126df101ec8040f49
Diffstat (limited to 'src/plugins/cpptools/cppmodelmanager_test.cpp')
0 files changed, 0 insertions, 0 deletions