summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-06-23 03:01:22 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-06-23 03:01:22 +0200
commit1d5ed9c24a6ef46adca2ecdbcecf1e632525a7b8 (patch)
tree3d5df7fe5c91b3e7821fd10082413135196ac79f /tests
parent15f7c10af4ef0e4495b3ce6df4c0281be93e37af (diff)
parent699a72558d3b254e2c911b1ea6c2dbf0198d5bee (diff)
downloadqtwebsockets-1d5ed9c24a6ef46adca2ecdbcecf1e632525a7b8.tar.gz
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ifc79e75eb7e5397d30ed061d5067e80feceecc4a
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions