summaryrefslogtreecommitdiff
path: root/src/script/script.pro
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2015-10-22 09:38:11 +0200
committerLiang Qi <liang.qi@theqtcompany.com>2015-10-22 09:38:11 +0200
commitd80f57f60f39bb98948e22e94036104ddabd5e2b (patch)
treeb2b9fd477e6e38ba3c8e4951752bb9083647efdc /src/script/script.pro
parent09674580bb1c2225678db5d22a1c092a86aaa75d (diff)
parent7ebf02ea3e8e91b13eb2d34847c005d8a487e9da (diff)
downloadqtscript-d80f57f60f39bb98948e22e94036104ddabd5e2b.tar.gz
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: Iabc282a0396f2403a7a89712be279dd8e894df41
Diffstat (limited to 'src/script/script.pro')
0 files changed, 0 insertions, 0 deletions