summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2015-05-29 19:34:19 +0200
committerLiang Qi <liang.qi@theqtcompany.com>2015-05-29 19:34:19 +0200
commite6a356ad0919432f005a4b626cd1aa2f2e564c6f (patch)
tree03df5ba359065b5f3b7d61dfc4aab48a990a5552 /doc
parent75f90d6dab7120b8595c7354acf213476be5646f (diff)
parent5d6969bf32233a57e081ff027a3426db11108cf4 (diff)
Merge remote-tracking branch 'origin/5.4' into 5.5
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions