- (bal) Starting the Unicossmk merger. File merged TODO, configure.in,

[openssh.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index a7ee18ee8898f5e81ff4889495ffcc74840ffcba..08d5e9f91ae435274b3434d7194505602b9b095b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+20010722
+ - (bal) Starting the Unicossmk merger.  File merged TODO, configure.in,
+        myproposal.h, ssh_prng_cmds.in, and openbsd-compat/Makefile.in.
+        Added openbsd-compat/bsd-cray.c.  Rest will be merged after
+        approval.  Selective patches from William L. Jones 
+        <jones@mail.utexas.edu> 
+
+20010719
+ - (tim) [configure.in] put inet_aton back in AC_CHECK_FUNCS.
+        report from Mark Miller <markm@swoon.net>
+
 20010718
  - OpenBSD CVS Sync
    - stevesk@cvs.openbsd.org 2001/07/14 15:10:17
@@ -19,6 +30,9 @@
      [channels.c channels.h clientloop.c nchan.c serverloop.c]
      keep track of both maxfd and the size of the malloc'ed fdsets.
      update maxfd if maxfd gets closed.
+   - mouring@cvs.openbsd.org 2001/07/18 16:45:52
+     [scp.c]
+     Missing -o in scp usage()
  - (bal) Cleaned up trailing spaces in ChangeLog.
  - (bal) Allow sshd to switch user context without password for Cygwin.
          Patch by Corinna Vinschen <vinschen@redhat.com>