summaryrefslogtreecommitdiff
path: root/tests/auto
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-09-24 03:04:34 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-09-24 03:04:40 +0200
commit31cfb286aefcd4625d8b41961ac87c592581d839 (patch)
tree78fd2291314ae1407aa310567c88ab67248e750a /tests/auto
parentd234e25d530f19979fbfc4b4fea73277358a0a39 (diff)
parentff8ac61c5ddab365fbed5b1534be05d79d9e978a (diff)
downloadqtwebsockets-31cfb286aefcd4625d8b41961ac87c592581d839.tar.gz
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
Diffstat (limited to 'tests/auto')
0 files changed, 0 insertions, 0 deletions