Browse Source

Merge branch 'master' into dev

# Conflicts:
#	source/WinSCP.cbproj

Source commit: 3aab4d187d986b7fc9ed26057c94f15dfd3d93ec
Martin Prikryl 8 years ago
parent
commit
2401a1372e

Diff Data Not Available.