# Conflicts: # source/WinSCP.cbproj # source/putty/version.h Source commit: 1f2bef8aa33ef777534f6496a3a1d33929bad0e1
Martin Prikryl