summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-02-11 03:01:15 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-02-11 03:01:15 +0100
commitd04b4defb20d9238c829609dd0b34f50772f63cf (patch)
tree932dc9104073c9eb594958c4c3eea7fe2b8ec3dd
parent3bb18b7d6fdeeb425b199aa34a77c8f841ec1a03 (diff)
parent127d475324c2133b8d7e2f4712e71d14fa84c560 (diff)
downloadqtwebsockets-d04b4defb20d9238c829609dd0b34f50772f63cf.tar.gz
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: If380706605e79377abefd2e781c75507574503c9
0 files changed, 0 insertions, 0 deletions