diff options
author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-08-09 15:26:42 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-08-09 15:26:42 +0200 |
commit | 1fe941917a3c93d74e9058f8ca9ed2b6b8ac78a3 (patch) | |
tree | e2d6638089d69c7d0497923a320f146b9d3eb47a /LICENSE.LGPLv3 | |
parent | 77c5d38325e35660be86e0bde3c18a7e2180ccf9 (diff) | |
parent | a3ec0e469e9fbc49af3151f9f747ee980fae22cd (diff) |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: I511a4d0098913e0081c491f75d997a5aa6c85214
Diffstat (limited to 'LICENSE.LGPLv3')
0 files changed, 0 insertions, 0 deletions