diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-24 12:21:34 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-02-24 12:21:34 +0000 |
| commit | b01068a406f6ebf51e103dd541f36fd6ef144805 (patch) | |
| tree | 9a1d2d634ce28672a72dfd1c7565f95cc82c2cb4 /src/websockets/qwebsocketframe.cpp | |
| parent | 9989055693ac6225ae3e6f8153862765b0cd5e7e (diff) | |
| parent | b797778da01f72e64cda8680f29f3fa8434ffb0a (diff) | |
| download | qtwebsockets-b01068a406f6ebf51e103dd541f36fd6ef144805.tar.gz | |
Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5
Diffstat (limited to 'src/websockets/qwebsocketframe.cpp')
0 files changed, 0 insertions, 0 deletions