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 /scp.0 | |
| parent | c6a2c0334e45419875687d250aed9bea78480f2e (diff) | |
| parent | ffc06452028ba78cd693d4ed43df8b60a10d6163 (diff) | |
merge 6.2p1; reorder additions to monitor.h for easier merging in future
Diffstat (limited to 'scp.0')
| -rw-r--r-- | scp.0 | 2 |
1 files changed, 1 insertions, 1 deletions
| @@ -155,4 +155,4 @@ AUTHORS | |||
| 155 | Timo Rinne <tri@iki.fi> | 155 | Timo Rinne <tri@iki.fi> |
| 156 | Tatu Ylonen <ylo@cs.hut.fi> | 156 | Tatu Ylonen <ylo@cs.hut.fi> |
| 157 | 157 | ||
| 158 | OpenBSD 5.2 September 5, 2011 OpenBSD 5.2 | 158 | OpenBSD 5.3 September 5, 2011 OpenBSD 5.3 |