merge in new release

[unix-history] / usr / src / usr.sbin / amd / fsinfo / fsi_gram.y

diff --git a/usr/src/usr.sbin/amd/fsinfo/fsi_gram.y b/usr/src/usr.sbin/amd/fsinfo/fsi_gram.y
index 98769d5..4645741 100644 (file)
--- a/usr/src/usr.sbin/amd/fsinfo/fsi_gram.y
+++ b/usr/src/usr.sbin/amd/fsinfo/fsi_gram.y
@@ -1,6 +1,4 @@
 /*
 /*

- * $Id: fsi_gram.y,v 5.2.1.2 90/12/21 16:46:46 jsp Alpha $
- *

  * Copyright (c) 1989 Jan-Simon Pendry
  * Copyright (c) 1989 Imperial College of Science, Technology & Medicine
  * Copyright (c) 1989 The Regents of the University of California.
  * Copyright (c) 1989 Jan-Simon Pendry
  * Copyright (c) 1989 Imperial College of Science, Technology & Medicine
  * Copyright (c) 1989 The Regents of the University of California.


@@ -9,21 +7,12 @@
  * This code is derived from software contributed to Berkeley by
  * Jan-Simon Pendry at Imperial College, London.
  *
  * This code is derived from software contributed to Berkeley by
  * Jan-Simon Pendry at Imperial College, London.
  *

- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement:  ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * 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.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * %sccs.include.redist.c%
+ *
+ *     @(#)fsi_gram.y  5.4 (Berkeley) %G%
+ *
+ * $Id: fsi_gram.y,v 5.2.2.1 1992/02/09 15:09:35 jsp beta $

  *
  *

- *     @(#)fsi_gram.y  5.1 (Berkeley) %G%

  */
 
 %{
  */
 
 %{