summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2016-03-07 19:31:23 +0100
committerLiang Qi <liang.qi@theqtcompany.com>2016-03-07 19:31:23 +0100
commit7477c86107ac0f5d344b380b38118c3a90f994a7 (patch)
treedfab513c73345083f9ff7cf41438a530cb78cb8a /examples
parent05808fb8b011c760a2af6dd520b781447db4a0ba (diff)
parent7c5d5ab0d6ab20f0052dedddcd7df5eb1d5eaa3d (diff)
downloadqtactiveqt-7477c86107ac0f5d344b380b38118c3a90f994a7.tar.gz
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I51bb4162845894f4757a0d0dc40e2c04af546f06
Diffstat (limited to 'examples')
0 files changed, 0 insertions, 0 deletions