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

[openssh.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 26c2d88739a6180f38af1a3dec6023bcc57f8398..08d5e9f91ae435274b3434d7194505602b9b095b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+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>