- (djm) OpenBSD CVS Sync

[openssh.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 8d306375cff552082b7fe902ec26aadd1d6c7df5..dba055ceb17f8ae6746c258902a436261e9d1280 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+20050617
+ - (djm) OpenBSD CVS Sync
+   - djm@cvs.openbsd.org 2005/06/16 03:38:36
+     [channels.c channels.h clientloop.c clientloop.h ssh.c]
+     move x11_get_proto from ssh.c to clientloop.c, to make muliplexed xfwd
+     easier later; ok deraadt@
+
+
 20050616
  - (djm) OpenBSD CVS Sync
    - jaredy@cvs.openbsd.org 2005/06/07 13:25:23