summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog7
1 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1784bd131..281faccab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,11 @@
15 - jmc@cvs.openbsd.org 2006/01/03 16:55:18 15 - jmc@cvs.openbsd.org 2006/01/03 16:55:18
16 [ssh.1] 16 [ssh.1]
17 tweak the description of ~/.ssh/environment 17 tweak the description of ~/.ssh/environment
18 - jmc@cvs.openbsd.org 2006/01/04 18:42:46
19 [ssh.1]
20 chop out some duplication in the .{r,s}hosts/{h,sh}osts.equiv FILES
21 entries;
22 ok markus
18 23
1920060103 2420060103
20 - (djm) [channels.c] clean up harmless merge error, from reyk@ 25 - (djm) [channels.c] clean up harmless merge error, from reyk@
@@ -3649,4 +3654,4 @@
3649 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3654 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3650 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3655 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3651 3656
3652$Id: ChangeLog,v 1.4077 2006/01/06 03:49:17 djm Exp $ 3657$Id: ChangeLog,v 1.4078 2006/01/06 03:49:38 djm Exp $