diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-09-17 10:28:19 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-09-17 10:28:19 +0200 |
| commit | 5ad724c61bc78cad19b265b177635c1e48bcbbaf (patch) | |
| tree | 53d7e9467d0b62396535224b9d89866ae4509d23 /src/tools/cplusplus-update-frontend/cplusplus-update-frontend.cpp | |
| parent | 0d185a0ad3f3efc2690356c7567d8351827deb88 (diff) | |
| parent | 364288b79cfb27f4bea9a7a41b785660fb8d0dde (diff) | |
| download | qt-creator-5ad724c61bc78cad19b265b177635c1e48bcbbaf.tar.gz | |
Merge remote-tracking branch 'origin/4.13' into master
Conflicts:
src/plugins/qmakeprojectmanager/qmakeproject.cpp
Change-Id: Ieb1c3e946f11d3c4fa1ee6b5afdf83cc532d8aed
Diffstat (limited to 'src/tools/cplusplus-update-frontend/cplusplus-update-frontend.cpp')
0 files changed, 0 insertions, 0 deletions