summaryrefslogtreecommitdiffstats
path: root/crypto/openssh/LICENCE
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2005-06-05 15:46:09 +0000
committerdes <des@FreeBSD.org>2005-06-05 15:46:09 +0000
commit983ad11a1c78949e86a0f51f51ef0d614cc5e665 (patch)
tree7d41ca8690f59b7463bd4d5fefde78dac8a00e60 /crypto/openssh/LICENCE
parent3c5bc6b274083ffa3a7aa67e87c8936a1778eff5 (diff)
downloadFreeBSD-src-983ad11a1c78949e86a0f51f51ef0d614cc5e665.zip
FreeBSD-src-983ad11a1c78949e86a0f51f51ef0d614cc5e665.tar.gz
Resolve conflicts.
Diffstat (limited to 'crypto/openssh/LICENCE')
-rw-r--r--crypto/openssh/LICENCE5
1 files changed, 3 insertions, 2 deletions
diff --git a/crypto/openssh/LICENCE b/crypto/openssh/LICENCE
index d8c1573..ae03eb3 100644
--- a/crypto/openssh/LICENCE
+++ b/crypto/openssh/LICENCE
@@ -97,7 +97,7 @@ OpenSSH contains no GPL code.
* <http://www.core-sdi.com>
3)
- ssh-keygen was contributed by David Mazieres under a BSD-style
+ ssh-keyscan was contributed by David Mazieres under a BSD-style
license.
* Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
@@ -203,6 +203,7 @@ OpenSSH contains no GPL code.
Wayne Schroeder
William Jones
Darren Tucker
+ Sun Microsystems
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -329,4 +330,4 @@ OpenSSH contains no GPL code.
------
-$OpenBSD: LICENCE,v 1.18 2003/11/21 11:57:02 djm Exp $
+$OpenBSD: LICENCE,v 1.19 2004/08/30 09:18:08 markus Exp $
OpenPOWER on IntegriCloud