diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-02-05 10:19:52 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-02-05 11:59:35 +0100 |
| commit | 5c121d57911d91f19b066803ad38ca4815255dde (patch) | |
| tree | 728e9206d48968ccbc72dafcd284da4c47b2a9e7 /src/plugins/cpptools/cppfilesettingspage.cpp | |
| parent | aeb7ef6b37030ed4beb8f431167d2ef88172486b (diff) | |
| parent | b2ddeacfb5c54d3b0e15c8e6087d21aefaed4d7a (diff) | |
| download | qt-creator-5c121d57911d91f19b066803ad38ca4815255dde.tar.gz | |
Merge remote-tracking branch 'origin/4.11'
Conflicts:
src/plugins/genericprojectmanager/genericproject.cpp
Change-Id: Ib54f1645ec70a9e6460a888a13190ede130bccca
Diffstat (limited to 'src/plugins/cpptools/cppfilesettingspage.cpp')
0 files changed, 0 insertions, 0 deletions