1 files changed, 6 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 57dfff43d..4cfdbc7a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,11 @@
    - markus@cvs.openbsd.org 2001/05/30 15:20:10
      [ssh.c]
      merge functions, simplify.
+   - markus@cvs.openbsd.org 2001/05/31 10:30:17
+     [auth-options.c auth2.c channels.c channels.h clientloop.c nchan.c 
+      packet.c serverloop.c session.c ssh.c]
+     undo the .c file split, just merge the header and keep the cvs 
+     history
 
 20010606
  - OpenBSD CVS Sync
@@ -5518,4 +5523,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1248 2001/06/09 00:18:51 mouring Exp $
+$Id: ChangeLog,v 1.1249 2001/06/09 00:36:26 mouring Exp $