This commit was manufactured by cvs2svn to create tag 'FreeBSD-release/1.1'.

[unix-history] / sys / sys / conf.h

diff --git a/sys/sys/conf.h b/sys/sys/conf.h
index d4afff5..5aa04bd 100644 (file)
--- a/sys/sys/conf.h
+++ b/sys/sys/conf.h
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) UNIX System Laboratories, Inc.  All or some portions
+ * of this file are derived from material licensed to the
+ * University of California by American Telephone and Telegraph Co.
+ * or UNIX System Laboratories, Inc. and are reproduced herein with
+ * the permission of UNIX System Laboratories, Inc.
+ */

 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.


@@ -31,7 +38,7 @@
  * SUCH DAMAGE.
  *
  *     from: @(#)conf.h        7.9 (Berkeley) 5/5/91
  * SUCH DAMAGE.
  *
  *     from: @(#)conf.h        7.9 (Berkeley) 5/5/91

- *     $Id: conf.h,v 1.3 1993/11/07 17:52:26 wollman Exp $
+ *     $Id: conf.h,v 1.4 1993/11/25 01:37:55 wollman Exp $

  */
 
 #ifndef _SYS_CONF_H_
  */
 
 #ifndef _SYS_CONF_H_