diff options
author | Liang Qi <liang.qi@qt.io> | 2018-04-20 15:29:36 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-04-20 15:29:36 +0200 |
commit | 38e6ddc9ee4725733782d1745e473ce391547e21 (patch) | |
tree | 2e33c84c70e6359bbe687336b3032b1ec8a80042 /configure.json | |
parent | 2671e050231d9fbbbaecde7738737e311a239589 (diff) | |
parent | 795981e7205752aa3007fa14e13b7d0e78937261 (diff) |
Merge remote-tracking branch 'origin/5.11' into 5.11.0
Change-Id: Ida278c6731466e7de8c9dc9115a948488869a746
Diffstat (limited to 'configure.json')
0 files changed, 0 insertions, 0 deletions