- markus@cvs.openbsd.org 2002/01/09 17:16:00

[openssh.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index a6c79b6e7a4fc2971bfd50aca71b432289349fad..a66a04d1eb7270c738149b26558a648845c53c8f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -103,6 +103,9 @@
    - markus@cvs.openbsd.org 2002/01/09 13:49:27
      [ssh-keygen.c]
      append \n only for public keys
+   - markus@cvs.openbsd.org 2002/01/09 17:16:00
+     [channels.c]
+     merge channel_pre_open_15/channel_pre_open_20; ok provos@
 
 
 20020121