diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-04 03:00:31 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-04 03:00:31 +0100 |
commit | b2a57e4538cf0231abad99b4c5aa949b62974dc1 (patch) | |
tree | 3b0601c4aa521db4f021de7ed705f2ab8ed294e9 | |
parent | 169f4dc95dfe18a6c7f87029ad996d49d3eff8fc (diff) | |
parent | 3031fd369cfb5b7f03aabc61f239adc1268302ff (diff) | |
download | qtwebsockets-b2a57e4538cf0231abad99b4c5aa949b62974dc1.tar.gz |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I8fede16504f86533ec3f3842ecd7b7549624507f
0 files changed, 0 insertions, 0 deletions