summaryrefslogtreecommitdiffstats
path: root/qtwebsockets
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2019-12-05 14:47:57 +0100
committerLiang Qi <liang.qi@qt.io>2019-12-05 14:47:57 +0100
commit4282752c1993420d0ab1c21c5dad01679cf18365 (patch)
treecf8ae2deae7b2889070b59bfd742061fc6a50dff /qtwebsockets
parent7c1c98e123c8b255c079b299d4e84680512396ca (diff)
parente4f9ac5607a329bae045567a339d36469bc4fff6 (diff)
Merge remote-tracking branch 'origin/5.14' into 5.15
Diffstat (limited to 'qtwebsockets')
0 files changed, 0 insertions, 0 deletions