diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-28 03:04:57 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-28 03:04:57 +0100 |
commit | 59a4bc77f412c00968fad729bf3c11c94825545d (patch) | |
tree | 892846c90d8761cd20e027e9f40c7c7b6b25d7e3 /src/websockets/qwebsocketframe.cpp | |
parent | 51dd88d8963920b850d79e22b1820d207e0569c7 (diff) | |
parent | 564ca782a94e389e212bf2fdeeb4be84c54915c0 (diff) | |
download | qtwebsockets-59a4bc77f412c00968fad729bf3c11c94825545d.tar.gz |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Iff98ea3277da7e35af6567680d0b84755e30e1af
Diffstat (limited to 'src/websockets/qwebsocketframe.cpp')
0 files changed, 0 insertions, 0 deletions