Home Explore Help
Register Sign In
Apq
/
winscp
mirror of https://github.com/winscp/winscp.git
1
0
Fork 0
Files Issues 0 Wiki
Browse Source

Merge branch 'master' into dev

# Conflicts:
#	source/packages/filemng/DirView.pas
#	source/windows/WinConfiguration.cpp

Source commit: 05631395edf17d0d9b1bbcf73538aadd13f30125
Martin Prikryl 7 years ago
parent
273e913a60 0ce5afd2e4
commit
6a415db01a

Diff Data Not Available.