diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-05-07 22:11:10 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-05-08 08:35:30 +0200 |
| commit | 41379a50c7b99987842cb6467c37bcc63cf0f0c8 (patch) | |
| tree | be195057400aef094d01cf77758b287c32822fb9 /configure.json | |
| parent | f5754fd722c981ca157e7c650ecd271c9077b7cc (diff) | |
| parent | a4a7f71f37843d6f0809855ba443541faa3cdc87 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.9.0
Conflicts:
coin/platform_configs/default.txt
coin/platform_configs/qt5.txt
Change-Id: Id82a13a6b2fe6db60c286e470396298c08e363b8
Diffstat (limited to 'configure.json')
0 files changed, 0 insertions, 0 deletions