Conflicts: src/network/access/qhttpthreaddelegate.cpp Change-Id: Id47b977587e2d713c16ac17e63c5ec80c2f05ee9 |
||
|---|---|---|
| .. | ||
| certs | ||
| http2.pro | ||
| http2srv.cpp | ||
| http2srv.h | ||
| tst_http2.cpp | ||
Conflicts: src/network/access/qhttpthreaddelegate.cpp Change-Id: Id47b977587e2d713c16ac17e63c5ec80c2f05ee9 |
||
|---|---|---|
| .. | ||
| certs | ||
| http2.pro | ||
| http2srv.cpp | ||
| http2srv.h | ||
| tst_http2.cpp | ||