diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2016-12-21 21:38:29 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2016-12-21 21:38:29 +0100 |
| commit | 591c6d0446453b303638d86b31199d535b8f481e (patch) | |
| tree | 4ec42e7220da5f9d730d6a4e0fa116094c297aa7 /coin/provisioning/qtci-windows-10-x86/conanfiles | |
| parent | 2f9d551948323c86e727d246c34c5f46a3661b8c (diff) | |
| parent | 8a60455e61d6a7cd11eb7da02bdf1cae8ff97b8b (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
coin/provisioning/common/02-python.ps1
Change-Id: I6b5f2c464cc350798c7c73fba9e79a3f4f534586
Diffstat (limited to 'coin/provisioning/qtci-windows-10-x86/conanfiles')
0 files changed, 0 insertions, 0 deletions