diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-06-06 09:57:01 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-06-06 09:57:01 +0200 |
| commit | 3f356f31bc311e5eeacee7e1ac01ed7d2f9943de (patch) | |
| tree | e52f5b67c8d60c68015c8d99252e01fc7e54dbda /src/plugins/cpptools/cppmodelmanager.cpp | |
| parent | 0fbb2839f92b001414d1eed2ae2627cf421fd34f (diff) | |
| parent | 5921376573bf57b09fa89fa788b94f2a5a1fdda9 (diff) | |
| download | qt-creator-3f356f31bc311e5eeacee7e1ac01ed7d2f9943de.tar.gz | |
Merge remote-tracking branch 'origin/4.7'
Conflicts:
qbs/modules/qtc/qtc.qbs
qtcreator.pri
Change-Id: I3d42bd52fb7b977cfdfad83092fb6f6eac974e24
Diffstat (limited to 'src/plugins/cpptools/cppmodelmanager.cpp')
0 files changed, 0 insertions, 0 deletions