diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-02 13:55:07 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-02 13:55:07 +0200 |
| commit | 6484afa4b7645b31e370f4eb8ea0b93fc3bf052a (patch) | |
| tree | 9ff1eacd8dcb1943613785e3ad6df77bf38523bb /src/imports | |
| parent | f11862a05591452bdad9c1abd244288a2964a036 (diff) | |
| parent | 12e424f241b29ef26ad2a3a70740d8b320e9e85a (diff) | |
| download | qtwebsockets-6484afa4b7645b31e370f4eb8ea0b93fc3bf052a.tar.gz | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Conflicts:
tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp
Change-Id: Ie4184b0788b6a0a5a85ca8e4d1547c33f7027ca0
Diffstat (limited to 'src/imports')
0 files changed, 0 insertions, 0 deletions