diff options
| author | Michael Brüning <michael.bruning@qt.io> | 2016-12-07 13:55:20 +0100 |
|---|---|---|
| committer | Michael Brüning <michael.bruning@qt.io> | 2016-12-07 13:55:20 +0100 |
| commit | c7f8e360da41df8b81004fe45f1582845a951c2b (patch) | |
| tree | 32cf6ecb336af7d89a0a86153bb07ee49f23baa9 /configure.json | |
| parent | 3d000cfc013158f56c0b088c9ee99b03938ef50b (diff) | |
| parent | 5ec330cec86cd7781ced295790ce93ac8748dcc4 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
src/3rdparty
Change-Id: Ie7b7c469aa24716816a23b8fe7a8df9f477a9f67
Diffstat (limited to 'configure.json')
0 files changed, 0 insertions, 0 deletions