diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-05-28 16:10:23 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-05-28 16:10:23 +0200 |
| commit | c8c6b28e225c17d1ec9a0d9ce13220a610cfa7c7 (patch) | |
| tree | 4abcf5b716f2f3bad7cde28df67bf4ae18ca3500 /src/plugins/projectexplorer/makestep.cpp | |
| parent | 005b0c1147813aa518a617b31cab3ecec058618a (diff) | |
| parent | c1c57f0c383f88451d1b6c8fe83caa6f2f071048 (diff) | |
Merge remote-tracking branch 'origin/4.7'
Conflicts:
src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h
Change-Id: I192b9e88f967182f3275b4b98abed1220c26daac
Diffstat (limited to 'src/plugins/projectexplorer/makestep.cpp')
0 files changed, 0 insertions, 0 deletions