diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-23 03:02:54 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-23 03:02:54 +0200 |
commit | 3e0681051e5fb58863a25c1b689906d36b7e35b9 (patch) | |
tree | 670add23e99abf95d0436c6f3a49a6003a275281 /src/imports/templates/plugins.qmltypes | |
parent | 83813e43405109478769010acf2caf85a4229501 (diff) | |
parent | 1d06eb3f8215b67c5061ee3a076df405724ff7ee (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I8c038d287f066f2935ba0bceef5dd078704fd276
Diffstat (limited to 'src/imports/templates/plugins.qmltypes')
0 files changed, 0 insertions, 0 deletions