90210d5d9c
Conflicts: tests/auto/network/kernel/qnetworkinterface/BLACKLIST Change-Id: I1e8866c63b54bcd95fc2a044276ee15b7f60e79a |
||
---|---|---|
.. | ||
resources | ||
.gitignore | ||
qfiledialog.pro | ||
tst_qfiledialog.cpp |
90210d5d9c
Conflicts: tests/auto/network/kernel/qnetworkinterface/BLACKLIST Change-Id: I1e8866c63b54bcd95fc2a044276ee15b7f60e79a |
||
---|---|---|
.. | ||
resources | ||
.gitignore | ||
qfiledialog.pro | ||
tst_qfiledialog.cpp |