883dfb3d15
Conflicts: src/widgets/kernel/qwidget.cpp This merge also extends the expected output of the pairdiagnostics teamcity output (added in dev in commit |
||
---|---|---|
.. | ||
access | ||
bearer | ||
kernel | ||
socket | ||
ssl | ||
network.pro |
883dfb3d15
Conflicts: src/widgets/kernel/qwidget.cpp This merge also extends the expected output of the pairdiagnostics teamcity output (added in dev in commit |
||
---|---|---|
.. | ||
access | ||
bearer | ||
kernel | ||
socket | ||
ssl | ||
network.pro |