diff options
author | Colin Watson <cjwatson@debian.org> | 2005-05-25 11:01:01 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2005-05-25 11:01:01 +0000 |
commit | e88de75a1a236779a10e8ccbcc51d25308be8840 (patch) | |
tree | 7495477a2a7d0cac17a9fcded020b6ea816182ef /LICENCE | |
parent | 30a0f9443782cd9d7308acd09430bf586186aa55 (diff) | |
parent | 5d05471f6657646d1d6500c7c43134462c407ee6 (diff) |
Merge 4.0p1 to the trunk.
Diffstat (limited to 'LICENCE')
-rw-r--r-- | LICENCE | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -97,7 +97,7 @@ OpenSSH contains no GPL code. | |||
97 | * <http://www.core-sdi.com> | 97 | * <http://www.core-sdi.com> |
98 | 98 | ||
99 | 3) | 99 | 3) |
100 | ssh-keygen was contributed by David Mazieres under a BSD-style | 100 | ssh-keyscan was contributed by David Mazieres under a BSD-style |
101 | license. | 101 | license. |
102 | 102 | ||
103 | * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. | 103 | * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. |
@@ -203,6 +203,7 @@ OpenSSH contains no GPL code. | |||
203 | Wayne Schroeder | 203 | Wayne Schroeder |
204 | William Jones | 204 | William Jones |
205 | Darren Tucker | 205 | Darren Tucker |
206 | Sun Microsystems | ||
206 | 207 | ||
207 | * Redistribution and use in source and binary forms, with or without | 208 | * Redistribution and use in source and binary forms, with or without |
208 | * modification, are permitted provided that the following conditions | 209 | * modification, are permitted provided that the following conditions |
@@ -329,4 +330,4 @@ OpenSSH contains no GPL code. | |||
329 | 330 | ||
330 | 331 | ||
331 | ------ | 332 | ------ |
332 | $OpenBSD: LICENCE,v 1.18 2003/11/21 11:57:02 djm Exp $ | 333 | $OpenBSD: LICENCE,v 1.19 2004/08/30 09:18:08 markus Exp $ |