Merge remote-tracking branch 'origin/3.1'
Conflicts: src/plugins/winrt/winrtruncontrol.cpp src/plugins/winrt/winrtruncontrol.h Change-Id: Idad0558e53e23debee8523586b681af4705e97f6
This diff is collapsed.
Please register or sign in to comment
Conflicts: src/plugins/winrt/winrtruncontrol.cpp src/plugins/winrt/winrtruncontrol.h Change-Id: Idad0558e53e23debee8523586b681af4705e97f6