diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-26 12:56:39 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-26 12:56:39 +0100 |
| commit | 5e66a1c5d25caef259e6e8b41023004c2b8de355 (patch) | |
| tree | 4ff0211df5cfde193d9d6c5b489ee00a468a5bff /src/imports/qmlwebsockets/qqmlwebsocket.cpp | |
| parent | ccb138548314a767a897496c74c04a261a391027 (diff) | |
| parent | 1f6a55f97dce97d4d2fe62b8b6a87c18d4f2627d (diff) | |
| download | qtwebsockets-5e66a1c5d25caef259e6e8b41023004c2b8de355.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Change-Id: Ia8c2930d5bf681227cef0730cdf0dca6d068722f
Diffstat (limited to 'src/imports/qmlwebsockets/qqmlwebsocket.cpp')
0 files changed, 0 insertions, 0 deletions