summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2016-04-08 10:23:45 +0200
committerLiang Qi <liang.qi@theqtcompany.com>2016-04-08 10:23:45 +0200
commitb49bfdaad11be1de632f907d43485a7ac701ddc5 (patch)
tree3e1553d28dada6cbce524d2ad4e2a97ff9fd8a9e /examples
parent55f2fe374f0314e87e1ca5618bab6fac94430c78 (diff)
parentb16873afea798d08799d7a0b255b8d200337f35b (diff)
downloadqtscript-b49bfdaad11be1de632f907d43485a7ac701ddc5.tar.gz
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1
Change-Id: I51a29b9b4b1307dd380126407fa4f5e4c80e127f
Diffstat (limited to 'examples')
0 files changed, 0 insertions, 0 deletions