Conflicts: src/corelib/global/qglobal.h src/corelib/io/qnoncontiguousbytedevice_p.h src/gui/image/qjpeghandler.cpp src/network/access/qhttpthreaddelegate_p.h tests/auto/corelib/io/qlockfile/tst_qlockfile.cpp tests/auto/widgets/widgets/qmenubar/BLACKLIST Change-Id: I01de8c1c28efcedfd7953d05025f54802dc08ab3 |
||
|---|---|---|
| .. | ||
| certs | ||
| echo | ||
| test | ||
| .gitattributes | ||
| .gitignore | ||
| BLACKLIST | ||
| bigfile | ||
| empty | ||
| image1.jpg | ||
| image2.jpg | ||
| image3.jpg | ||
| index.html | ||
| qnetworkreply.pro | ||
| qnetworkreply.qrc | ||
| resource | ||
| rfc3252.txt | ||
| smb-file.txt | ||
| tst_qnetworkreply.cpp | ||