summaryrefslogtreecommitdiffstats
path: root/LICENSE.GPL3-EXCEPT
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-01-18 12:47:02 +0100
committerLiang Qi <liang.qi@qt.io>2017-01-18 12:47:02 +0100
commit468e3c38a893b9293a9f0ede432ce54d72b46966 (patch)
tree0d43bfb13247a0e5ed55152a70637c4c98b59a83 /LICENSE.GPL3-EXCEPT
parentdcd89c6268f11c50a0833c41e5ab065aceb3c05f (diff)
parent61afd66f148af4a8d3e0cad12b7c9419f1122cbe (diff)
Merge remote-tracking branch 'origin/5.7' into 5.8
Diffstat (limited to 'LICENSE.GPL3-EXCEPT')
0 files changed, 0 insertions, 0 deletions