diff options
| author | Colin Watson <cjwatson@debian.org> | 2004-03-01 02:25:32 +0000 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2004-03-01 02:25:32 +0000 |
| commit | ea8116a11e3de70036dbc665ccb0d486cf89cac9 (patch) | |
| tree | d73ccdff78d8608e156465af42e6a1b3527fb2d6 /openbsd-compat/sys-tree.h | |
| parent | e39b311381a5609cc05acf298c42fba196dc524b (diff) | |
| parent | f5bda272678ec6dccaa5f29379cf60cb855018e8 (diff) | |
Merge 3.8p1 to the trunk. This builds and runs, but I haven't tested it
extensively yet.
ProtocolKeepAlives is now just a compatibility alias for
ServerAliveInterval.
Diffstat (limited to 'openbsd-compat/sys-tree.h')
| -rw-r--r-- | openbsd-compat/sys-tree.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/openbsd-compat/sys-tree.h b/openbsd-compat/sys-tree.h index 927ca04cd..73cfbe72a 100644 --- a/openbsd-compat/sys-tree.h +++ b/openbsd-compat/sys-tree.h | |||
| @@ -1,3 +1,5 @@ | |||
| 1 | /* OPENBSD ORIGINAL: sys/sys/tree.h */ | ||
| 2 | |||
| 1 | /* $OpenBSD: tree.h,v 1.7 2002/10/17 21:51:54 art Exp $ */ | 3 | /* $OpenBSD: tree.h,v 1.7 2002/10/17 21:51:54 art Exp $ */ |
| 2 | /* | 4 | /* |
| 3 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> | 5 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> |