diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-18 18:04:24 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-18 18:10:56 +0100 |
| commit | f8665a7cf5e18e5e40ad3e50039ba0362c5d2ec7 (patch) | |
| tree | 4be67e7c5b79800521d98a2cd527ffa337a6b56b /qtwebsockets.pro | |
| parent | f5ea17db7f103bb28f210d96c5b82b4315799930 (diff) | |
| parent | 78607d656e18717e2edb5e0430e7eeefaf24fa8b (diff) | |
| download | qtwebsockets-5.10.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into 5.105.10
Conflicts:
.qmake.conf
Change-Id: I4a88ddf6722f4b29512fbec71f3d055591e625ba
Diffstat (limited to 'qtwebsockets.pro')
0 files changed, 0 insertions, 0 deletions