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/resource/TextsWin1.rc

(no real conflict)

Source commit: b2ac0832a4da3e46f486fe08b48dfcb85b6bf2bb
Martin Prikryl 9 years ago
parent
20d2b8d642 589f7cfb57
commit
a38293e4e8

Diff Data Not Available.