Module Name: src
Committed By: snj
Date: Fri Oct 23 17:01:08 UTC 2009
Modified Files:
src/sys/arch/mvme68k/mvme68k: seglist.h
src/sys/arch/next68k/next68k: seglist.h
Log Message:
Drop 3rd and 4th clauses. Approved by scw (copyright holder).
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mvme68k/mvme68k/seglist.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/next68k/next68k/seglist.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mvme68k/mvme68k/seglist.h
diff -u src/sys/arch/mvme68k/mvme68k/seglist.h:1.4 src/sys/arch/mvme68k/mvme68k/seglist.h:1.5
--- src/sys/arch/mvme68k/mvme68k/seglist.h:1.4 Sat Aug 22 10:55:35 1998
+++ src/sys/arch/mvme68k/mvme68k/seglist.h Fri Oct 23 17:01:08 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: seglist.h,v 1.4 1998/08/22 10:55:35 scw Exp $ */
+/* $NetBSD: seglist.h,v 1.5 2009/10/23 17:01:08 snj Exp $ */
/*
* Copyright (c) 1997 The Steve Woodford
@@ -12,11 +12,6 @@
* 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 Steve Woodford.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
Index: src/sys/arch/next68k/next68k/seglist.h
diff -u src/sys/arch/next68k/next68k/seglist.h:1.5 src/sys/arch/next68k/next68k/seglist.h:1.6
--- src/sys/arch/next68k/next68k/seglist.h:1.5 Tue Nov 10 22:45:45 1998
+++ src/sys/arch/next68k/next68k/seglist.h Fri Oct 23 17:01:08 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: seglist.h,v 1.5 1998/11/10 22:45:45 dbj Exp $ */
+/* $NetBSD: seglist.h,v 1.6 2009/10/23 17:01:08 snj Exp $ */
/*
* This file was taken from from mvme68k/mvme68k/seglist.h
@@ -19,11 +19,6 @@
* 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 Steve Woodford.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES