summaryrefslogtreecommitdiff
path: root/LICENSE.GPL3-EXCEPT
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-03-02 03:03:21 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-03-02 03:03:22 +0100
commitf1c5e109a48b6fdef641528985e249c10c1ae1a2 (patch)
treedc4ec798c059e036980667cf7c41226e36ca49ce /LICENSE.GPL3-EXCEPT
parent7ca4b60ab4e368f7800f5a9687c9fa58fc0bc574 (diff)
parent09490d1ac6294173004f8f5b948dea9a1e412d3d (diff)
downloadqtmultimedia-f1c5e109a48b6fdef641528985e249c10c1ae1a2.tar.gz
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Ia2f6f90c44bb360810124bcfab558661a2644880
Diffstat (limited to 'LICENSE.GPL3-EXCEPT')
0 files changed, 0 insertions, 0 deletions