summaryrefslogtreecommitdiff
path: root/qtscript.pro
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-09-07 13:09:40 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-09-07 13:09:40 +0200
commit6dd705ee302db6d6770f2760efc8e48bf0637eac (patch)
treee32f6db59eb15ec520fd2763ea895a621463dd84 /qtscript.pro
parentefbc554c260f15b5c6dc23759eff96c106997a55 (diff)
parent1701681e4f8ee3b17ca39f563a24065ee43b3a52 (diff)
downloadqtscript-6dd705ee302db6d6770f2760efc8e48bf0637eac.tar.gz
Merge remote-tracking branch 'origin/5.12.5' into 5.12
Change-Id: I33b1c2d9caf5b2839c9e254e8f341c2382415373
Diffstat (limited to 'qtscript.pro')
0 files changed, 0 insertions, 0 deletions