diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-07-10 15:06:32 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-07-10 15:07:03 +0200 |
| commit | 29ea7a10b743976b471ccc3d1749db2d7df2e321 (patch) | |
| tree | 489c3cab927169318845c98af21b3d763512a779 /sources/pyside2/PySide2/QtQml/typesystem_qml.xml | |
| parent | 826fe14dcbcf703e38a4b51b9f3ac3fcf948c53f (diff) | |
| parent | 64838a9a171a8665ba0ad604870f8f4046cdf142 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.9
Change-Id: I9d55ec493763dc9536d7926d428aecf75c10a72d
Diffstat (limited to 'sources/pyside2/PySide2/QtQml/typesystem_qml.xml')
0 files changed, 0 insertions, 0 deletions