diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-14 19:51:34 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-14 19:51:34 +0200 |
| commit | dc1b711e360a9d17538216d89b6c510602df2282 (patch) | |
| tree | 9f11a260a46f4bcb5977be70bf014448f0b19132 /LICENSE.GPL2 | |
| parent | 5fe0b6d98a277dc3947eab803cdbadfb0596ab7d (diff) | |
| parent | 30fe82eb89e7b7f66444f5fabae9ac0954b1fecf (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: Ia12a1e050a28a26845ef83e9d18b1815c0bf1518
Diffstat (limited to 'LICENSE.GPL2')
0 files changed, 0 insertions, 0 deletions