Eike Ziller 3d1d9aae2e Merge remote-tracking branch 'origin/4.8' ...

Conflicts:
	src/plugins/winrt/winrtdevicefactory.cpp

Change-Id: I33b8697e2ebf2bea051d7f1144449e0743ee16a5

2018-11-19 10:00:18 +01:00

5.3 KiB

Raw Blame History

View Raw