summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-11-17 03:02:37 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-11-17 03:02:37 +0100
commit169f4dc95dfe18a6c7f87029ad996d49d3eff8fc (patch)
tree3b0601c4aa521db4f021de7ed705f2ab8ed294e9
parent7022a1f7e8f703815022bc7d0956da54f9f7a3c1 (diff)
parent5d66ee6af892f24b105e80d5b9634354395ce559 (diff)
downloadqtwebsockets-169f4dc95dfe18a6c7f87029ad996d49d3eff8fc.tar.gz
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I128f08249b5a20de2635134d51bc29698352cef6
0 files changed, 0 insertions, 0 deletions