commit b31783d5470d42f77a08acfe6513a0b209ffec1c
author Ben Lindstrom <mouring@eviladmin.org> Thu Mar 22 02:02:12 2001 +0000
committer Ben Lindstrom <mouring@eviladmin.org> Thu Mar 22 02:02:12 2001 +0000
tree aa2c8c7e957564f22ecd0e16680d1de0ba9e06da
parent fc9b07de19f8ccd94e4543ddba58e0de3748804c

   - markus@cvs.openbsd.org 2001/03/21 11:43:45
     [auth1.c auth2.c session.c session.h]
     merge common ssh v1/2 code

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 2f79384..af3e609 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,9 @@
    - markus@cvs.openbsd.org 2001/03/20 19:21:21
      [session.c]
      remove unused arg
+   - markus@cvs.openbsd.org 2001/03/21 11:43:45
+     [auth1.c auth2.c session.c session.h]
+     merge common ssh v1/2 code
 
 20010321
  - (djm) Fix ttyname breakage for AIX and Tru64. Patch from Steve 
@@ -4672,4 +4675,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1004 2001/03/22 01:27:23 mouring Exp $
+$Id: ChangeLog,v 1.1005 2001/03/22 02:02:12 mouring Exp $