71ec1d6d79
Conflicts: qmake/generators/win32/mingw_make.cpp Change-Id: I2f790bc8572bd22fea01edf7ca74595b29f063eb |
||
---|---|---|
.. | ||
.gitignore | ||
BLACKLIST | ||
qhostinfo.pro | ||
tst_qhostinfo.cpp |
71ec1d6d79
Conflicts: qmake/generators/win32/mingw_make.cpp Change-Id: I2f790bc8572bd22fea01edf7ca74595b29f063eb |
||
---|---|---|
.. | ||
.gitignore | ||
BLACKLIST | ||
qhostinfo.pro | ||
tst_qhostinfo.cpp |