diff options
author | Liang Qi <liang.qi@qt.io> | 2016-09-13 12:14:43 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-09-13 12:14:43 +0200 |
commit | 3e5229c689ca329db89b5af1afdc458688137db8 (patch) | |
tree | ebe77017813cab446ba1d25d40cfcf87b21dca25 /configure.json | |
parent | 1c06b83ff0df78d7c363d2fe19511661b431a0b7 (diff) | |
parent | 4477c49291213354a22e998db0572d9d71b4e65c (diff) |
Merge remote-tracking branch 'origin/5.7' into 5.8
Change-Id: I62235fec5e9b8b81e41d64bfcf58067dc1213d0c
Diffstat (limited to 'configure.json')
0 files changed, 0 insertions, 0 deletions