Merge upstream (can't test, hopefully nothing broke)

[bsdgames-darwin.git] / atc / tunable.h

diff --git a/atc/tunable.h b/atc/tunable.h
index 8ae00b02eeea5aa1f1099ddff92db7c852693bbd..2b183234d5e5aa3f32cc06abb6c80b42cff9517a 100644 (file)
--- a/atc/tunable.h
+++ b/atc/tunable.h
@@ -1,6 +1,8 @@
+/*     $NetBSD: tunable.h,v 1.4 2003/08/07 09:36:55 agc Exp $  */
+
 /*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1990, 1993
+ *     The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Ed James.
@@ -13,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.
  *
@@ -33,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *     @(#)tunable.h   5.3 (Berkeley) 4/30/90
+ *     @(#)tunable.h   8.1 (Berkeley) 5/31/93
  */
 
 /*