diff options
| author | des <des@FreeBSD.org> | 2005-09-03 07:04:25 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2005-09-03 07:04:25 +0000 |
| commit | 88c7c9558ba88abbcc00dcd9133b4996eff74033 (patch) | |
| tree | 15c858fecc18a67f9dcc639fd5be6afa6ed7037f /crypto/openssh/LICENCE | |
| parent | 1ea3628aba1278f27d571a26380b4e91155d3973 (diff) | |
| download | FreeBSD-src-88c7c9558ba88abbcc00dcd9133b4996eff74033.zip FreeBSD-src-88c7c9558ba88abbcc00dcd9133b4996eff74033.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'crypto/openssh/LICENCE')
| -rw-r--r-- | crypto/openssh/LICENCE | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/openssh/LICENCE b/crypto/openssh/LICENCE index ae03eb3..ac3634f 100644 --- a/crypto/openssh/LICENCE +++ b/crypto/openssh/LICENCE @@ -204,6 +204,7 @@ OpenSSH contains no GPL code. William Jones Darren Tucker Sun Microsystems + The SCO Group * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -255,6 +256,7 @@ OpenSSH contains no GPL code. Damien Miller Eric P. Allman The Regents of the University of California + Constantin S. Svintsoff * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions |
