1 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 0ab115203..bc0115e9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 19991030
 - Integrated debian package support from Dan Brosemer <odin@linuxfreak.com>
+ - Merged latest updates for OpenBSD CVS:
+   - channels.[ch] - remove broken x11 fix and document istate/ostate
+   - ssh-agent.c - call setsid() regardless of argv[]
+   - ssh.c - save a few lines when disabling rhosts-{rsa-}auth
+ - Documentation cleanups
+ - Renamed README -> README.Ylonen
+ - Renamed README.openssh ->README
 19991029
 - Renamed openssh* back to ssh* at request of Theo de Raadt

diff --git a/ChangeLog b/ChangeLog index 0ab115203..bc0115e9a 100644 --- a/ChangeLog +++ b/ChangeLog
@@ -1,5 +1,12 @@
1	19991030	1	19991030
2	- Integrated debian package support from Dan Brosemer <odin@linuxfreak.com>	2	- Integrated debian package support from Dan Brosemer <odin@linuxfreak.com>
		3	- Merged latest updates for OpenBSD CVS:
		4	- channels.[ch] - remove broken x11 fix and document istate/ostate
		5	- ssh-agent.c - call setsid() regardless of argv[]
		6	- ssh.c - save a few lines when disabling rhosts-{rsa-}auth
		7	- Documentation cleanups
		8	- Renamed README -> README.Ylonen
		9	- Renamed README.openssh ->README
3		10
4	19991029	11	19991029
5	- Renamed openssh* back to ssh* at request of Theo de Raadt	12	- Renamed openssh* back to ssh* at request of Theo de Raadt