summaryrefslogtreecommitdiff
path: root/LICENSE.GPL3-EXCEPT
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-02-02 09:50:54 +0100
committerLiang Qi <liang.qi@qt.io>2018-02-02 09:50:54 +0100
commit4395fed2b35dd12bb9bde5e20d91908d28196a06 (patch)
treee2388f414f9e7e8b75f7234f1ba23d5c6ce88208 /LICENSE.GPL3-EXCEPT
parent0a71cf73f1d5cad5b45972a51c4680b55671470e (diff)
parentf4ed0d4178ecdf50cdaca47716a5101a28494157 (diff)
downloadqtmultimedia-5.10.tar.gz
Merge remote-tracking branch 'origin/5.9' into 5.105.10
Change-Id: I0564f22f9001d373ad03426dd6d9f584fbab7115
Diffstat (limited to 'LICENSE.GPL3-EXCEPT')
0 files changed, 0 insertions, 0 deletions