summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--LICENCE1
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f974928f1..eb4cb365e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
120070313 120070313
2 - (dtucker) [entropy.c scard-opensc.c ssh-rand-helper.c] Bug #1294: include 2 - (dtucker) [entropy.c scard-opensc.c ssh-rand-helper.c] Bug #1294: include
3 string.h to prevent warnings, from vapier at gentoo.org. 3 string.h to prevent warnings, from vapier at gentoo.org.
4 - (dtucker) [LICENCE] Add Daniel Walsh as a copyright holder for the
5 selinux bits in -portable.
4 6
520070306 720070306
6 - (djm) OpenBSD CVS Sync 8 - (djm) OpenBSD CVS Sync
@@ -2820,4 +2822,4 @@
2820 OpenServer 6 and add osr5bigcrypt support so when someone migrates 2822 OpenServer 6 and add osr5bigcrypt support so when someone migrates
2821 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 2823 passwords between UnixWare and OpenServer they will still work. OK dtucker@
2822 2824
2823$Id: ChangeLog,v 1.4637 2007/03/12 20:35:38 dtucker Exp $ 2825$Id: ChangeLog,v 1.4638 2007/03/12 20:37:49 dtucker Exp $
diff --git a/LICENCE b/LICENCE
index 0c2ff067a..3964b1d77 100644
--- a/LICENCE
+++ b/LICENCE
@@ -205,6 +205,7 @@ OpenSSH contains no GPL code.
205 Darren Tucker 205 Darren Tucker
206 Sun Microsystems 206 Sun Microsystems
207 The SCO Group 207 The SCO Group
208 Daniel Walsh
208 209
209 * Redistribution and use in source and binary forms, with or without 210 * Redistribution and use in source and binary forms, with or without
210 * modification, are permitted provided that the following conditions 211 * modification, are permitted provided that the following conditions