diff options
author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-08-09 15:26:34 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-08-09 15:26:34 +0200 |
commit | 7b25c625ea50a58edb1d6d5c79ea6dcb00cfc12b (patch) | |
tree | 6e707041a258ed3a0c34cd52857b02d237e9a0eb /LICENSE.LGPLv3 | |
parent | 2f0de14dc8fa529ef61c8599ec927e440e25b467 (diff) | |
parent | 46159b840cfcfeaea5b1c78d1d0e4fa40d679366 (diff) |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: Ie63185f66c060582a11ee75eca215d6536283e86
Diffstat (limited to 'LICENSE.LGPLv3')
0 files changed, 0 insertions, 0 deletions