diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-28 10:30:41 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-28 10:31:16 +0200 |
| commit | ab1f3ee4c5fea333d5c0d3a6eb9eeda987763cc9 (patch) | |
| tree | bb3cc9db1f2b7fee130be4529972be9077c7eb28 /LGPL_EXCEPTION.txt | |
| parent | 40696d9f14962c8520cc27d5f909f87a0c82c2ff (diff) | |
| parent | 5598cebd35157890af20fa824fc9f1c92340270c (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6v5.6.0-alpha1
Change-Id: Id599e08b463989329ab369586bc01582eb64e445
Diffstat (limited to 'LGPL_EXCEPTION.txt')
0 files changed, 0 insertions, 0 deletions