diff --git a/ChangeLog b/ChangeLog index b3065e996..def8fc3c7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +20041105 + - (dtucker) OpenBSD CVS Sync + - markus@cvs.openbsd.org 2004/08/30 09:18:08 + [LICENCE] + s/keygen/keyscan/ + 20041102 - (dtucker) [configure.ac includes.h] Bug #947: Fix compile error on HP-UX 10.x by testing for conflicts in shadow.h and undef'ing _INCLUDE__STDC__ @@ -1776,4 +1782,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3562 2004/11/02 09:30:54 dtucker Exp $ +$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. * 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 . @@ -329,4 +329,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 $