summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--LICENCE1
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5d51f2e61..b4945700d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
120060815
2 - (dtucker) [LICENCE] Add Reyk to the list for the compat dir.
3
120060806 420060806
2 - (djm) [openbsd-compat/bsd-getpeereid.c] Add some headers to quiet warnings 5 - (djm) [openbsd-compat/bsd-getpeereid.c] Add some headers to quiet warnings
3 on Solaris 10 6 on Solaris 10
@@ -5204,4 +5207,4 @@
5204 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 5207 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
5205 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 5208 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
5206 5209
5207$Id: ChangeLog,v 1.4477 2006/08/07 01:26:36 djm Exp $ 5210$Id: ChangeLog,v 1.4478 2006/08/15 08:21:32 dtucker Exp $
diff --git a/LICENCE b/LICENCE
index ac3634f22..17d94aef5 100644
--- a/LICENCE
+++ b/LICENCE
@@ -287,6 +287,7 @@ OpenSSH contains no GPL code.
287 287
288 Internet Software Consortium. 288 Internet Software Consortium.
289 Todd C. Miller 289 Todd C. Miller
290 Reyk Floeter
290 291
291 * Permission to use, copy, modify, and distribute this software for any 292 * Permission to use, copy, modify, and distribute this software for any
292 * purpose with or without fee is hereby granted, provided that the above 293 * purpose with or without fee is hereby granted, provided that the above