diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-18 21:10:00 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-18 21:10:47 +0100 |
| commit | 8a549aca7b371722cbf012d85216e4560ef1cf33 (patch) | |
| tree | 1bccd03f06cb6fb3fdb0f7f09af44d44868ea6a7 | |
| parent | 4b517f81d5db4f452eee5330f8f9db9877909130 (diff) | |
| parent | 0b418f5512943eca6059855a584902f70a5dbadb (diff) | |
| download | qtwebsockets-8a549aca7b371722cbf012d85216e4560ef1cf33.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into 5.11v5.11.0-beta2v5.11.0-beta1
Conflicts:
.qmake.conf
Change-Id: I249953f4865302c9fb8d3d9ae4aabb7e60c31a60
0 files changed, 0 insertions, 0 deletions