diff options
author | Matthew Vernon <mcv21@cam.ac.uk> | 2014-03-25 11:53:50 +0000 |
---|---|---|
committer | Matthew Vernon <mcv21@cam.ac.uk> | 2014-03-25 11:53:51 +0000 |
commit | 0d3be96ca152f30e4800f569b12311300064c2a9 (patch) | |
tree | 8a40acbec1fceab9f438b179020059673d56146a /debian/patches/ssh1-keepalive.patch | |
parent | 5c4cc02836ec0e74636a69c2ba85e7b37e97bd6d (diff) | |
parent | db4cdf7b763414af951c7f4031b10679c54d7988 (diff) |
merge patched into master
Diffstat (limited to 'debian/patches/ssh1-keepalive.patch')
-rw-r--r-- | debian/patches/ssh1-keepalive.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/patches/ssh1-keepalive.patch b/debian/patches/ssh1-keepalive.patch index ded7c122a..60537323a 100644 --- a/debian/patches/ssh1-keepalive.patch +++ b/debian/patches/ssh1-keepalive.patch | |||
@@ -8,8 +8,8 @@ Last-Update: 2013-09-14 | |||
8 | 8 | ||
9 | Patch-Name: ssh1-keepalive.patch | 9 | Patch-Name: ssh1-keepalive.patch |
10 | --- | 10 | --- |
11 | clientloop.c | 25 +++++++++++++++---------- | 11 | clientloop.c | 25 +++++++++++++++---------- |
12 | ssh_config.5 | 5 ++++- | 12 | ssh_config.5 | 5 ++++- |
13 | 2 files changed, 19 insertions(+), 11 deletions(-) | 13 | 2 files changed, 19 insertions(+), 11 deletions(-) |
14 | 14 | ||
15 | diff --git a/clientloop.c b/clientloop.c | 15 | diff --git a/clientloop.c b/clientloop.c |