summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--LICENCE1
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index dd42df5dc..a20ad29b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,7 @@
11 platforms may need this--I'm not sure. mmap() issues will need to be 11 platforms may need this--I'm not sure. mmap() issues will need to be
12 addressed further. 12 addressed further.
13 - (tim) [cipher.c] fix problem with OpenBSD sync 13 - (tim) [cipher.c] fix problem with OpenBSD sync
14 - (stevesk) [LICENCE] OpenBSD sync
14 15
1520020321 1620020321
16 - (bal) OpenBSD CVS Sync 17 - (bal) OpenBSD CVS Sync
@@ -8005,4 +8006,4 @@
8005 - Wrote replacements for strlcpy and mkdtemp 8006 - Wrote replacements for strlcpy and mkdtemp
8006 - Released 1.0pre1 8007 - Released 1.0pre1
8007 8008
8008$Id: ChangeLog,v 1.1974 2002/03/22 21:27:40 tim Exp $ 8009$Id: ChangeLog,v 1.1975 2002/03/23 02:20:07 stevesk Exp $
diff --git a/LICENCE b/LICENCE
index 1c98a1d62..2824c09c6 100644
--- a/LICENCE
+++ b/LICENCE
@@ -190,6 +190,7 @@ OpenSSH contains no GPL code.
190 Aaron Campbell 190 Aaron Campbell
191 Damien Miller 191 Damien Miller
192 Kevin Steves 192 Kevin Steves
193 Daniel Kouril
193 194
194 * Redistribution and use in source and binary forms, with or without 195 * Redistribution and use in source and binary forms, with or without
195 * modification, are permitted provided that the following conditions 196 * modification, are permitted provided that the following conditions