summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2016-01-29 11:00:42 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2016-01-29 12:55:06 +0000
commit270cc073b7e0fbc34d635aa70788e70d66433334 (patch)
tree9efaa30f2798b70857bb9bb0fe4912d57bc93167 /doc
parent0ec1e13234684feb632fc980ba2a90db9a2dd936 (diff)
parenta81036c3cc13d16dfc84903babe4774f5578787b (diff)
Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions