diff options
author | Liang Qi <liang.qi@qt.io> | 2016-06-09 11:15:46 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-06-09 11:15:46 +0200 |
commit | 5a562aa4a923f5585879a9875307aaf85054ed40 (patch) | |
tree | 90e5cdb5ecc22a980486d6fac1e72c89c8be1175 /LICENSE.GPLv2 | |
parent | 79d3d49c4c4bf1d07f377d24d8c6e571abe80355 (diff) | |
parent | b08c3e69e3e82014b0f16b1ff94e5edd31d5c2c6 (diff) |
Merge remote-tracking branch 'origin/5.6.1' into 5.6
Change-Id: If9cb1cf8facd7b606273ece472fac67abb6d6543
Diffstat (limited to 'LICENSE.GPLv2')
0 files changed, 0 insertions, 0 deletions