summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-04-07 03:01:32 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-04-07 03:01:32 +0200
commit4f0346907cd1e3c6e37dd0eb7ef99434a0e21587 (patch)
treefbafac065640ef6dbe190f58a2183ae3671e3f5b /tests
parent09e71c900ee86cad2fc92729c30ae512048e0179 (diff)
parent34ce4b65ba35a487bdb8afa5e59b57cfa3f9b0e0 (diff)
downloadqtwebsockets-4f0346907cd1e3c6e37dd0eb7ef99434a0e21587.tar.gz
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I13027e583850886d2e973be9ff121cac23af9205
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions