diff options
| author | Colin Watson <cjwatson@debian.org> | 2013-05-07 10:06:42 +0100 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2013-05-07 10:06:42 +0100 |
| commit | ecebda56da46a03dafff923d91c382f31faa9eec (patch) | |
| tree | 449614b6c06a2622c74a609b31fcc46c60037c56 /ssh-agent.0 | |
| parent | c6a2c0334e45419875687d250aed9bea78480f2e (diff) | |
| parent | ffc06452028ba78cd693d4ed43df8b60a10d6163 (diff) | |
merge 6.2p1; reorder additions to monitor.h for easier merging in future
Diffstat (limited to 'ssh-agent.0')
| -rw-r--r-- | ssh-agent.0 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ssh-agent.0 b/ssh-agent.0 index 77930ce42..578984815 100644 --- a/ssh-agent.0 +++ b/ssh-agent.0 | |||
| @@ -120,4 +120,4 @@ AUTHORS | |||
| 120 | created OpenSSH. Markus Friedl contributed the support for SSH protocol | 120 | created OpenSSH. Markus Friedl contributed the support for SSH protocol |
| 121 | versions 1.5 and 2.0. | 121 | versions 1.5 and 2.0. |
| 122 | 122 | ||
| 123 | OpenBSD 5.2 November 21, 2010 OpenBSD 5.2 | 123 | OpenBSD 5.3 November 21, 2010 OpenBSD 5.3 |