# Conflicts: # source/core/PuttyIntf.cpp # source/putty/windows/network.c Source commit: b27d7b2e4d39516b8504c8547b51b70f6155b60f
Martin Prikryl