summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 60ea75fd4..f5e287dc4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
120060103 120060103
2 - (djm) [channels.c] clean up harmless merge error, from reyk@
3
420060103
2 - (djm) OpenBSD CVS Sync 5 - (djm) OpenBSD CVS Sync
3 - jmc@cvs.openbsd.org 2006/01/02 17:09:49 6 - jmc@cvs.openbsd.org 2006/01/02 17:09:49
4 [ssh_config.5 sshd_config.5] 7 [ssh_config.5 sshd_config.5]
@@ -3628,4 +3631,4 @@
3628 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3631 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3629 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3632 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3630 3633
3631$Id: ChangeLog,v 1.4072 2006/01/03 07:47:31 djm Exp $ 3634$Id: ChangeLog,v 1.4073 2006/01/03 20:27:50 djm Exp $