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:
	dotnet/Properties/AssemblyInfo.cs
	source/windows/WinMain.cpp

Source commit: 32ebb8c765457368e9578e8f865e127d3449d853
Martin Prikryl 8 years ago
parent
f968c93340 231ab0d17d
commit
e7637dd3d3

Diff Data Not Available.