summaryrefslogtreecommitdiff
path: root/LICENSE.GPL3-EXCEPT
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-06-17 12:33:53 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-06-17 12:33:53 +0200
commitf582f7ecbd35d9825fc17ecc9c4bcca7b9cb28ac (patch)
treee9eadad9147abb934cf4471760f2bf4d6feee0e7 /LICENSE.GPL3-EXCEPT
parent30794c6737a1105bdcd840e41ff374ece3bc60e1 (diff)
parentba122ea95e89ec6f687b9f0386a017cf281bcc40 (diff)
downloadqtwebsockets-f582f7ecbd35d9825fc17ecc9c4bcca7b9cb28ac.tar.gz
Merge "Merge remote-tracking branch 'origin/5.12.4' into 5.12"
Diffstat (limited to 'LICENSE.GPL3-EXCEPT')
0 files changed, 0 insertions, 0 deletions