summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-09-23 09:36:42 +0200
committerLiang Qi <liang.qi@qt.io>2016-09-23 09:36:42 +0200
commit36feb681a97b3dd690a54d2eafd58081036992f1 (patch)
treed9f908d943ebc545e4c5584a24cee47414cd4b0d /src/core
parent7d6c94db4c42339ca2948be802f2579ba5522f58 (diff)
parentec84507898e58a167b185ba674acf300cc695380 (diff)
Merge remote-tracking branch 'origin/5.6.2' into 5.6
Diffstat (limited to 'src/core')
0 files changed, 0 insertions, 0 deletions