diff options
| author | Paul Olav Tvete <paul.tvete@qt.io> | 2019-06-05 13:21:22 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@qt.io> | 2019-06-05 13:21:22 +0200 |
| commit | 70d422afb8f631e14140f22b01256013b28b7034 (patch) | |
| tree | 7e2e2155cb976122a6d586a9e6d00c3210ba1f0d /src/client/configure.json | |
| parent | d829ba99c862efbdb6a040627176913a8a1e3847 (diff) | |
| parent | cde2fe3fba31b9b8d258f0663bc34009fd769efd (diff) | |
Merge remote-tracking branch 'qt/5.12' into texturesharing-5.12
Change-Id: Ib8fba00f848821bfab58d33aff74ace436af204a
Diffstat (limited to 'src/client/configure.json')
0 files changed, 0 insertions, 0 deletions