diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-01-12 22:12:18 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-12 22:19:30 +0100 |
| commit | 9de5f6957ce9ed1e9d1216dadc755f07783a3870 (patch) | |
| tree | 3dce81ad23ab57406ad294d2aba8fa86d33f4ecf /.gitmodules | |
| parent | 7b17d411f17bd3309673a2855e1c08bd791bf897 (diff) | |
| parent | 0f4fdb9490488f02342b61e8264837a7008e0687 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
This change also includes an update of the CI platform configurations to
the values that were previously in the CI source tree for builds of the
5.8 branch.
This is done within the same change as the merge to preserve atomicity.
Task-number: QTQAINFRA-1074
Change-Id: Iac469c44048721530380ab577c6dbf1a6fa28211
Diffstat (limited to '.gitmodules')
0 files changed, 0 insertions, 0 deletions