Conflicts: src/corelib/kernel/qcfsocketnotifier.cpp src/tools/qdoc/qdocindexfiles.cpp Change-Id: Iae365b23afc611de8794f22cceae8b210d25aa8a |
||
|---|---|---|
| .. | ||
| BLACKLIST | ||
| networkselftest.pro | ||
| tst_networkselftest.cpp | ||
Conflicts: src/corelib/kernel/qcfsocketnotifier.cpp src/tools/qdoc/qdocindexfiles.cpp Change-Id: Iae365b23afc611de8794f22cceae8b210d25aa8a |
||
|---|---|---|
| .. | ||
| BLACKLIST | ||
| networkselftest.pro | ||
| tst_networkselftest.cpp | ||