deee7b7ece
Conflicts: .qmake.conf qmake/generators/makefile.cpp Change-Id: Ifb2633a69d0bf8cdf12d799c6259beefc279c49e |
||
---|---|---|
.. | ||
stressTest | ||
test | ||
.gitignore | ||
BLACKLIST | ||
qtcpsocket.pro | ||
tst_qtcpsocket.cpp |
deee7b7ece
Conflicts: .qmake.conf qmake/generators/makefile.cpp Change-Id: Ifb2633a69d0bf8cdf12d799c6259beefc279c49e |
||
---|---|---|
.. | ||
stressTest | ||
test | ||
.gitignore | ||
BLACKLIST | ||
qtcpsocket.pro | ||
tst_qtcpsocket.cpp |