diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-19 14:04:47 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-19 14:04:47 +0200 |
commit | d6208094e75086bca4e9dadb4ba34b21c51e02d9 (patch) | |
tree | 9f66b59615c570d38fb9efe7bf6fa8964150d55e /LICENSE.FDL | |
parent | 2d447ab630bc4aa687ca6a5268f2f24ec568f522 (diff) | |
parent | 8fe1236810ce0e36e1ac888b37883a1149512228 (diff) |
Merge remote-tracking branch 'origin/5.5' into 5.6v5.6.0-alpha1
Change-Id: I7bf7ed6c6341636168a6e7eb57e09688be11ae99
Diffstat (limited to 'LICENSE.FDL')
0 files changed, 0 insertions, 0 deletions