diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-12 03:00:57 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-12 03:00:57 +0200 |
commit | 5b0e0c522a3aeee1b46e492fedd8e297ead1a606 (patch) | |
tree | e38830aeeab6cd740187f35011bd49fc42d6ec9f /LGPL_EXCEPTION.txt | |
parent | 8d3cfb4f6ed698c48577f1afac29cbca04b91244 (diff) | |
parent | 7b8f4c839de016d5bf6bec1389655b7cad3b6533 (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I159b0cf12d09cdcfb0261c70a30e7b0adfd4ec27
Diffstat (limited to 'LGPL_EXCEPTION.txt')
0 files changed, 0 insertions, 0 deletions