summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-06-19 13:16:16 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-06-19 13:16:16 +0200
commit699a72558d3b254e2c911b1ea6c2dbf0198d5bee (patch)
tree8ddcd144973269f7e87e1aa2df4b66205edf1f3c /tests
parent1d2e34e85da3c20ee4901ed4ff63162a83c9f403 (diff)
parentd99ae2d542515cf53faa5998c1a8e6b9204a6470 (diff)
downloadqtwebsockets-699a72558d3b254e2c911b1ea6c2dbf0198d5bee.tar.gz
Merge remote-tracking branch 'origin/5.11.1' into 5.11
Change-Id: I09c1d0718bcd175fe3f3c8a20c1f4ee5b3ee3990
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions