summaryrefslogtreecommitdiffstats
path: root/LICENSE.GPL3-EXCEPT
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-09-11 03:00:05 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-09-11 03:00:05 +0200
commitc2cb9d286695bd3985c3ad18366e640abcc760d3 (patch)
tree2a2e364990b4b87e983997c9a40102371d3a9d35 /LICENSE.GPL3-EXCEPT
parentdd38f75d8614e5d4e1906594e1d83f284af42457 (diff)
parent855106d17258638cf50099b47d2db801c747ebb6 (diff)
Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-alpha1
Diffstat (limited to 'LICENSE.GPL3-EXCEPT')
0 files changed, 0 insertions, 0 deletions