diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-08-09 15:27:05 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-08-09 15:27:05 +0200 |
| commit | e5698cc60b751f343a9fe979ceeaec912f5b91f8 (patch) | |
| tree | 4a1d5fa7880f06f2bf4f4df08d6b0abe83e8c4e0 /LGPL_EXCEPTION.txt | |
| parent | 6d90d7c02450efd70ee36bc2bb8e1ed121d0c9bb (diff) | |
| parent | 6eb10a72b773cc474c067b764efb350920427fcf (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: Ief86005c1309fdd08f32513782ee75f7e9751bc1
Diffstat (limited to 'LGPL_EXCEPTION.txt')
0 files changed, 0 insertions, 0 deletions