summaryrefslogtreecommitdiff
path: root/LICENSE.GPLv3
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-05-24 20:02:50 +0200
committerLiang Qi <liang.qi@qt.io>2016-05-24 20:02:50 +0200
commitd387dd2066e79e4a39966331986c3775a0940e96 (patch)
tree829e5ee9b415bdc852bafe01955869b96397e45d /LICENSE.GPLv3
parent2baa571e0d95d3e9bf182dc035c8ff0970bb68ea (diff)
parentcd80c041220df2875297622a0012933412730e9d (diff)
downloadqtwebsockets-d387dd2066e79e4a39966331986c3775a0940e96.tar.gz
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: Ic4a2b48535dd9b22a950b84de4bfa2728a859902
Diffstat (limited to 'LICENSE.GPLv3')
0 files changed, 0 insertions, 0 deletions