summaryrefslogtreecommitdiffstats
path: root/qtscript.pro
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-06-27 16:36:47 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-06-28 13:25:57 +0200
commit6963c26e653660893c49f5546700642106e70ed9 (patch)
tree683d31d2bc01a1a5079d9df0ed67e191781de1b1 /qtscript.pro
parent66e484db9353d1ac1c7557d9d4cd0bfe0819f61b (diff)
parent5bfc952b1183f6956ce53eb8ae4d870eda60a199 (diff)
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
Diffstat (limited to 'qtscript.pro')
0 files changed, 0 insertions, 0 deletions