From owner-p4-projects@FreeBSD.ORG Sun May 16 13:41:43 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AAEFD16A4D0; Sun, 16 May 2004 13:41:42 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 813F616A4CE for ; Sun, 16 May 2004 13:41:42 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9613743D31 for ; Sun, 16 May 2004 13:41:41 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i4GKffGe007855 for ; Sun, 16 May 2004 13:41:41 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i4GKfeMu007849 for perforce@freebsd.org; Sun, 16 May 2004 13:41:40 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Sun, 16 May 2004 13:41:40 -0700 (PDT) Message-Id: <200405162041.i4GKfeMu007849@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 52873 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 May 2004 20:41:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=52873 Change 52873 by peter@peter_overcee on 2004/05/16 13:41:15 whoops, can't merge these clause-3 removals from i386 because obrien has a mention in the header. Affected files ... .. //depot/projects/hammer/sys/amd64/include/param.h#16 edit .. //depot/projects/hammer/sys/amd64/include/varargs.h#8 edit Differences ... ==== //depot/projects/hammer/sys/amd64/include/param.h#16 (text+ko) ==== @@ -15,6 +15,10 @@ * 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 * may be used to endorse or promote products derived from this software * without specific prior written permission. ==== //depot/projects/hammer/sys/amd64/include/varargs.h#8 (text+ko) ==== @@ -16,6 +16,10 @@ * 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 * may be used to endorse or promote products derived from this software * without specific prior written permission.