diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-12-18 10:25:43 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-12-18 10:46:46 +0100 |
commit | 90178924ee7dda26e5f9b07c21eb6b3c7b802c98 (patch) | |
tree | 47a4e72b173e5e2ad10aacbb726931f03e358e27 /LICENSE.GPL3-EXCEPT | |
parent | 168867aac8789f00adad08e574b16569084cb9cd (diff) | |
parent | 6f9ecd0a4675b0e1a7ef6851cbda7e43c05e9536 (diff) |
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: I9ddd2bdd830a862cd81dc1af5616d43e652a1c0e
Diffstat (limited to 'LICENSE.GPL3-EXCEPT')
0 files changed, 0 insertions, 0 deletions