summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-09-25 18:15:33 +0200
committerLiang Qi <liang.qi@qt.io>2016-09-25 18:15:33 +0200
commiteaa9d9ef09d7441dfbabdbc672573a05b545e98e (patch)
treec6778c7a45aaedfb4f9cc527766da182eef68fd1 /src
parent8e45fe6d6c2084752983d905cf22f777e7062baf (diff)
parentb4ada3f0d8feed7dbff22aa780d38ab126020ac6 (diff)
Merge remote-tracking branch 'origin/5.6.2' into 5.6
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions