aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/types
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-10-16 01:01:50 +0200
committerUlf Hermann <ulf.hermann@qt.io>2019-10-16 09:05:39 +0200
commit40321e482be6ce4137495216297ab282964fc0c2 (patch)
tree7a570317ae3e9afb06713a96092e802908edca4e /src/qml/types
parent9793931e958c8e78f3aeed2d2cdb37b2d5ca8207 (diff)
parent8f3cc4c29d4cb4cdb1f91ab08d7ec45dd9504345 (diff)
Merge "Merge remote-tracking branch 'origin/5.15' into dev"
Diffstat (limited to 'src/qml/types')
0 files changed, 0 insertions, 0 deletions