diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-11-06 18:05:00 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-11-06 18:05:07 +0100 |
| commit | 692ff260851575171be6751a7bdf34a744c2ed9d (patch) | |
| tree | 67c2ee80fb6a477f731ebc1898a5dfd43c878d2d /src/qml/configure.json | |
| parent | 8740f35e69dad301eeaa2fc4b74ecab661cdc0c4 (diff) | |
| parent | 5cb76fb3704947cfc4d575695b137460ecc8bbd9 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: I1ed923d72566af663555898c3ec708191eef8ae9
Diffstat (limited to 'src/qml/configure.json')
0 files changed, 0 insertions, 0 deletions