summaryrefslogtreecommitdiffstats
path: root/LICENSE.GPL3-EXCEPT
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-04-20 03:01:10 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-04-20 03:01:10 +0200
commitf52ff01d38400d5343af9149414f3573580a2405 (patch)
tree05e41522348583b1a9e6203c89ee83a733b3dfa6 /LICENSE.GPL3-EXCEPT
parentcf5741a44a6c337fa523080838d8e9220f4370c1 (diff)
parenteffb9ec6f5abfe50277de410769e7d8e01e6d97f (diff)
Merge remote-tracking branch 'origin/5.12' into 5.13
Diffstat (limited to 'LICENSE.GPL3-EXCEPT')
0 files changed, 0 insertions, 0 deletions