Browse Source

Merge branch 'master' into dev

# Conflicts:
#	source/windows/VCLCommon.cpp

Source commit: 5a4f7447011cadd4c97fce375c3bd560d8765401
Martin Prikryl 7 years ago
parent
commit
9f2c45f5b8

Diff Data Not Available.