diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-23 20:09:58 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-06-23 20:09:58 +0000 |
| commit | 06f55f0695932870b8f874949591662a9fb64008 (patch) | |
| tree | cb3a911a66726c94393f0d95eadabc8423be4a41 /configure.json | |
| parent | fa2368263035de40091368529c4e8197c756ff33 (diff) | |
| parent | dd90af122154af8ba8cba16c8760c3d2a1d0fcab (diff) | |
Merge "Merge remote-tracking branch 'origin/5.7' into dev" into refs/staging/dev
Diffstat (limited to 'configure.json')
0 files changed, 0 insertions, 0 deletions