[src/netbsd-1-6]: src/bin/pax Pullup rev 1.4-1.5 (requested by rafal in ticke...

[jmc <jmc%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/aa29766ad3de
branches:  netbsd-1-6
changeset: 531267:aa29766ad3de
user:      jmc <jmc%NetBSD.org@localhost>
date:      Wed Apr 07 06:57:45 2004 +0000

description:
Pullup rev 1.4-1.5 (requested by rafal in ticket #1021)

Pullup pax to current version on trunk. Includes many fixes.

diffstat:

 bin/pax/ftree.h |  8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diffs (22 lines):

diff -r d5e8ccaa4226 -r aa29766ad3de bin/pax/ftree.h
--- a/bin/pax/ftree.h   Wed Apr 07 06:57:42 2004 +0000
+++ b/bin/pax/ftree.h   Wed Apr 07 06:57:45 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ftree.h,v 1.3 1995/03/21 09:07:23 cgd Exp $    */
+/*     $NetBSD: ftree.h,v 1.3.18.1 2004/04/07 06:57:45 jmc Exp $       */
 
 /*-
  * Copyright (c) 1992 Keith Muller.
@@ -16,11 +16,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.
  *