diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-11-20 07:29:43 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-11-20 07:29:43 +0100 |
| commit | f9183e71bfa54165cb0d1a6e3ecac2842b28732a (patch) | |
| tree | 1abe4384405f3a64394deafd747b44eb391501d1 /qtwebsockets | |
| parent | b3f160bc3955378bb85bd8b28ba1da9118f5457e (diff) | |
| parent | dcfef7226fb54288858d234764f15582c77f5b05 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I03ba6455b8789eefb87a844d5fdbe0998cb02337
Diffstat (limited to 'qtwebsockets')
0 files changed, 0 insertions, 0 deletions