Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 16 May 2004 13:41:40 -0700 (PDT)
From:      Peter Wemm <peter@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 52873 for review
Message-ID:  <200405162041.i4GKfeMu007849@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
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.



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200405162041.i4GKfeMu007849>