32084b0733
Conflicts: src/corelib/tools/qcollator_win.cpp Change-Id: I6d806d7c58b2057ebde3ad915bb5551f34b700e5 |
||
---|---|---|
.. | ||
access | ||
bearer | ||
kernel | ||
socket | ||
ssl | ||
network.pro |
32084b0733
Conflicts: src/corelib/tools/qcollator_win.cpp Change-Id: I6d806d7c58b2057ebde3ad915bb5551f34b700e5 |
||
---|---|---|
.. | ||
access | ||
bearer | ||
kernel | ||
socket | ||
ssl | ||
network.pro |