diff options
author | Liang Qi <liang.qi@qt.io> | 2016-11-24 19:36:33 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-11-24 19:36:33 +0100 |
commit | 310271a4aa43aad9d8ca09154e5af5b1d6338fc4 (patch) | |
tree | b47ce82b4ec8a0f22b777b525d12212e4b2b9414 /LICENSE.FDL | |
parent | a97868ac6da467a07fe0b18b23dd1fb3f2bdaf7e (diff) | |
parent | 4df65d379733b35d9d3d5d16ed43bfefeea75763 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.75.7
Change-Id: Ic43abb034fa0a65b86a6e3511d29b8231ced5ec2
Diffstat (limited to 'LICENSE.FDL')
0 files changed, 0 insertions, 0 deletions