diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-11-21 16:12:56 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-11-21 16:12:56 +0100 |
| commit | 44a5d30b863b536768afddf4792ebb93585a644a (patch) | |
| tree | f41765eb1efbcf39bc5577affb8091eaa48898a5 /src/imports/qmlwebsockets_compat | |
| parent | 06df2dac55dfac912b7eb1cbb6c29f2b0594ae10 (diff) | |
| parent | 64927e04f202d33b9a9a1f94141ef692c0b513ac (diff) | |
| download | qtwebsockets-44a5d30b863b536768afddf4792ebb93585a644a.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: Ifc23e46ef1623cfba93571ff03c6c62a3b2fd117
Diffstat (limited to 'src/imports/qmlwebsockets_compat')
0 files changed, 0 insertions, 0 deletions