diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-02 11:29:47 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-02 11:29:47 +0200 |
| commit | 32c3d9bb5a8825296cdfc92ffeeb44f74efbb638 (patch) | |
| tree | dd1af3d7da1c64caac6d3b7c3f21c06e89477714 /src/websockets/websockets.pro | |
| parent | 5bc48a4443b5b4a3ab2e20c6c839305f698946ed (diff) | |
| parent | 38d830d00fc2f8c196d736094448e55623e4b35e (diff) | |
| download | qtwebsockets-32c3d9bb5a8825296cdfc92ffeeb44f74efbb638.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
.qmake.conf
Change-Id: I593c47e7aeebb7997f42a7408a8d22704d2713a1
Diffstat (limited to 'src/websockets/websockets.pro')
0 files changed, 0 insertions, 0 deletions