diff options
author | serg@serg.mylan <> | 2005-04-29 19:31:56 +0200 |
---|---|---|
committer | serg@serg.mylan <> | 2005-04-29 19:31:56 +0200 |
commit | 328f2e434a2289c9c9dcf0178c996f5269310391 (patch) | |
tree | 5668aa9ce7b897640a509c918d6dc0f26852dc2d /cmd-line-utils/libedit/hist.h | |
parent | e9b04111104071dfeea24a59bd7058ea8ee13aec (diff) | |
parent | c2339a6ff00d276e5c5ff0eb1db2cba53b3d17a6 (diff) | |
download | mariadb-git-328f2e434a2289c9c9dcf0178c996f5269310391.tar.gz |
Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
Diffstat (limited to 'cmd-line-utils/libedit/hist.h')
-rw-r--r-- | cmd-line-utils/libedit/hist.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/cmd-line-utils/libedit/hist.h b/cmd-line-utils/libedit/hist.h index b713281b382..46e14634adf 100644 --- a/cmd-line-utils/libedit/hist.h +++ b/cmd-line-utils/libedit/hist.h @@ -1,4 +1,4 @@ -/* $NetBSD: hist.h,v 1.9 2003/01/21 18:40:23 christos Exp $ */ +/* $NetBSD: hist.h,v 1.10 2003/08/07 16:44:31 agc Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -15,11 +15,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * |