diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-12-10 09:58:18 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-12-10 09:58:18 +0100 |
| commit | c5ea60cb84fc7af57a85389a20d91e8397cce1a8 (patch) | |
| tree | 6f9394b540efb6b0319b6b649d728de84e6d4af0 /LICENSE.GPL2 | |
| parent | 944129e3022a28a5cb969c6adaf01378b4555375 (diff) | |
| parent | 8ba610490e2d93526c165584e2f52c7ae8e9edc0 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: Iaf57c1b0beffdceb3f0533aa77ba536ec4c373a9
Diffstat (limited to 'LICENSE.GPL2')
0 files changed, 0 insertions, 0 deletions