diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-30 11:19:56 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-30 11:19:56 +0100 |
| commit | f42b228928c3e51c46bdf0ef855b4832fa59817e (patch) | |
| tree | 4940eb921eb7960251273b0f71c8936461e3f5bc /src/websockets/qwebsocket_p.cpp | |
| parent | f5d71e75d217c8313bc70669c52948704e7eda51 (diff) | |
| parent | 737a86f30a78add874b4bff310d4f84f49cc9b50 (diff) | |
| download | qtwebsockets-f42b228928c3e51c46bdf0ef855b4832fa59817e.tar.gz | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
.qmake.conf
Change-Id: Ic89c6250fae297177b4990de302b4bde71709216
Diffstat (limited to 'src/websockets/qwebsocket_p.cpp')
0 files changed, 0 insertions, 0 deletions