summaryrefslogtreecommitdiff
path: root/src/websockets/qwebsocketframe.cpp
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2016-03-17 16:09:17 +0100
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2016-03-17 16:09:17 +0100
commit3b128f9b45f4fafc305ff0c89cfc2cb665c856d5 (patch)
tree551509f74725ff9b77996db8f513bbf046adc539 /src/websockets/qwebsocketframe.cpp
parentb7aa461042ac1dfa22212a2783323d6ce1fd69fd (diff)
parent88946bbe209cb6148b4a3284077bb9a06c7bc1ef (diff)
downloadqtwebsockets-3b128f9b45f4fafc305ff0c89cfc2cb665c856d5.tar.gz
Merge remote-tracking branch 'origin/5.6.0' into 5.6
Change-Id: I11c3b9f39d56d3b26e0f3c4012cb2e3afee46341
Diffstat (limited to 'src/websockets/qwebsocketframe.cpp')
0 files changed, 0 insertions, 0 deletions