summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--LICENCE4
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index b3065e996..def8fc3c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
120041105
2 - (dtucker) OpenBSD CVS Sync
3 - markus@cvs.openbsd.org 2004/08/30 09:18:08
4 [LICENCE]
5 s/keygen/keyscan/
6
120041102 720041102
2 - (dtucker) [configure.ac includes.h] Bug #947: Fix compile error on HP-UX 8 - (dtucker) [configure.ac includes.h] Bug #947: Fix compile error on HP-UX
3 10.x by testing for conflicts in shadow.h and undef'ing _INCLUDE__STDC__ 9 10.x by testing for conflicts in shadow.h and undef'ing _INCLUDE__STDC__
@@ -1776,4 +1782,4 @@
1776 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1782 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1777 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1783 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1778 1784
1779$Id: ChangeLog,v 1.3562 2004/11/02 09:30:54 dtucker Exp $ 1785$Id: ChangeLog,v 1.3563 2004/11/05 09:00:03 dtucker Exp $
diff --git a/LICENCE b/LICENCE
index d8c157304..f9062bd51 100644
--- a/LICENCE
+++ b/LICENCE
@@ -97,7 +97,7 @@ OpenSSH contains no GPL code.
97 * <http://www.core-sdi.com> 97 * <http://www.core-sdi.com>
98 98
993) 993)
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>.
@@ -329,4 +329,4 @@ OpenSSH contains no GPL code.
329 329
330 330
331------ 331------
332$OpenBSD: LICENCE,v 1.18 2003/11/21 11:57:02 djm Exp $ 332$OpenBSD: LICENCE,v 1.19 2004/08/30 09:18:08 markus Exp $