Module Name: xsrc
Committed By: tsutsui
Date: Fri Apr 10 16:49:37 UTC 2020
Modified Files:
xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k: x68k.h
x68kConfig.c x68kFb.c x68kGraph.c x68kInit.c x68kIo.c x68kKbd.c
x68kKeyMap.c x68kMouse.c x68kReg.h x68kText.c
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68k.h x68kConfig.c
x68kFb.c x68kGraph.c x68kInit.c x68kIo.c x68kKbd.c x68kKeyMap.c
x68kMouse.c x68kReg.h x68kText.c
Log Message:
Remove clause 3 and 4 from X68k server files written by Yasushi Yamasaki.
I've finally contacted with Yamasaki-san and he kindly answered
"no objection to change them to 2 clause license" in private mail.
Diffs to be committed have also been confirmed by him.
We appreciate all his contribution to early NetBSD/x68k.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68k.h \
xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kConfig.c \
xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kFb.c \
xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kGraph.c \
xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kInit.c \
xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kIo.c \
xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kKbd.c \
xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kKeyMap.c \
xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kMouse.c \
xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kReg.h \
xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kText.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kConfig.c \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kText.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c
cvs rdiff -u -r1.1 -r1.2 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kIo.c \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKeyMap.c \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kReg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68k.h
diff -u xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68k.h:1.1.1.1 xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68k.h:1.2
--- xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68k.h:1.1.1.1 Thu Jun 9 09:07:59 2016
+++ xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68k.h Fri Apr 10 16:49:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68k.h,v 1.1.1.1 2016/06/09 09:07:59 mrg Exp $ */
+/* $NetBSD: x68k.h,v 1.2 2020/04/10 16:49:36 tsutsui Exp $ */
/*-------------------------------------------------------------------------
* Copyright (c) 1996 Yasushi Yamasaki
* All rights reserved.
@@ -11,11 +11,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 Yasushi Yamasaki
- * 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: xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kConfig.c
diff -u xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kConfig.c:1.1.1.1 xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kConfig.c:1.2
--- xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kConfig.c:1.1.1.1 Thu Jun 9 09:07:59 2016
+++ xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kConfig.c Fri Apr 10 16:49:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kConfig.c,v 1.1.1.1 2016/06/09 09:07:59 mrg Exp $ */
+/* $NetBSD: x68kConfig.c,v 1.2 2020/04/10 16:49:36 tsutsui Exp $ */
/*-------------------------------------------------------------------------
* Copyright (c) 1996 Yasushi Yamasaki
* All rights reserved.
@@ -11,11 +11,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 Yasushi Yamasaki
- * 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: xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kFb.c
diff -u xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kFb.c:1.1.1.1 xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kFb.c:1.2
--- xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kFb.c:1.1.1.1 Thu Jun 9 09:07:59 2016
+++ xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kFb.c Fri Apr 10 16:49:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kFb.c,v 1.1.1.1 2016/06/09 09:07:59 mrg Exp $ */
+/* $NetBSD: x68kFb.c,v 1.2 2020/04/10 16:49:36 tsutsui Exp $ */
/*-------------------------------------------------------------------------
* Copyright (c) 1996 Yasushi Yamasaki
* All rights reserved.
@@ -11,11 +11,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 Yasushi Yamasaki
- * 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: xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kGraph.c
diff -u xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kGraph.c:1.1.1.1 xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kGraph.c:1.2
--- xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kGraph.c:1.1.1.1 Thu Jun 9 09:07:59 2016
+++ xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kGraph.c Fri Apr 10 16:49:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kGraph.c,v 1.1.1.1 2016/06/09 09:07:59 mrg Exp $ */
+/* $NetBSD: x68kGraph.c,v 1.2 2020/04/10 16:49:36 tsutsui Exp $ */
/*-------------------------------------------------------------------------
* Copyright (c) 1996 Yasushi Yamasaki
* All rights reserved.
@@ -11,11 +11,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 Yasushi Yamasaki
- * 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: xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kInit.c
diff -u xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kInit.c:1.1.1.1 xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kInit.c:1.2
--- xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kInit.c:1.1.1.1 Thu Jun 9 09:07:59 2016
+++ xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kInit.c Fri Apr 10 16:49:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kInit.c,v 1.1.1.1 2016/06/09 09:07:59 mrg Exp $ */
+/* $NetBSD: x68kInit.c,v 1.2 2020/04/10 16:49:36 tsutsui Exp $ */
/*-------------------------------------------------------------------------
* Copyright (c) 1996 Yasushi Yamasaki
* All rights reserved.
@@ -11,11 +11,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 Yasushi Yamasaki
- * 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: xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kIo.c
diff -u xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kIo.c:1.1.1.1 xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kIo.c:1.2
--- xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kIo.c:1.1.1.1 Thu Jun 9 09:07:59 2016
+++ xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kIo.c Fri Apr 10 16:49:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kIo.c,v 1.1.1.1 2016/06/09 09:07:59 mrg Exp $ */
+/* $NetBSD: x68kIo.c,v 1.2 2020/04/10 16:49:36 tsutsui Exp $ */
/*-------------------------------------------------------------------------
* Copyright (c) 1996 Yasushi Yamasaki
* All rights reserved.
@@ -11,11 +11,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 Yasushi Yamasaki
- * 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: xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kKbd.c
diff -u xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kKbd.c:1.1.1.1 xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kKbd.c:1.2
--- xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kKbd.c:1.1.1.1 Thu Jun 9 09:07:59 2016
+++ xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kKbd.c Fri Apr 10 16:49:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kKbd.c,v 1.1.1.1 2016/06/09 09:07:59 mrg Exp $ */
+/* $NetBSD: x68kKbd.c,v 1.2 2020/04/10 16:49:36 tsutsui Exp $ */
/*-------------------------------------------------------------------------
* Copyright (c) 1996 Yasushi Yamasaki
* All rights reserved.
@@ -11,11 +11,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 Yasushi Yamasaki
- * 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: xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kKeyMap.c
diff -u xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kKeyMap.c:1.1.1.1 xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kKeyMap.c:1.2
--- xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kKeyMap.c:1.1.1.1 Thu Jun 9 09:07:59 2016
+++ xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kKeyMap.c Fri Apr 10 16:49:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kKeyMap.c,v 1.1.1.1 2016/06/09 09:07:59 mrg Exp $ */
+/* $NetBSD: x68kKeyMap.c,v 1.2 2020/04/10 16:49:36 tsutsui Exp $ */
/*-------------------------------------------------------------------------
* Copyright (c) 1996 Yasushi Yamasaki
* All rights reserved.
@@ -11,11 +11,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 Yasushi Yamasaki
- * 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: xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kMouse.c
diff -u xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kMouse.c:1.1.1.1 xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kMouse.c:1.2
--- xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kMouse.c:1.1.1.1 Thu Jun 9 09:07:59 2016
+++ xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kMouse.c Fri Apr 10 16:49:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kMouse.c,v 1.1.1.1 2016/06/09 09:07:59 mrg Exp $ */
+/* $NetBSD: x68kMouse.c,v 1.2 2020/04/10 16:49:36 tsutsui Exp $ */
/*-------------------------------------------------------------------------
* Copyright (c) 1996 Yasushi Yamasaki
* All rights reserved.
@@ -11,11 +11,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 Yasushi Yamasaki
- * 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: xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kReg.h
diff -u xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kReg.h:1.1.1.1 xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kReg.h:1.2
--- xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kReg.h:1.1.1.1 Thu Jun 9 09:07:59 2016
+++ xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kReg.h Fri Apr 10 16:49:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kReg.h,v 1.1.1.1 2016/06/09 09:07:59 mrg Exp $ */
+/* $NetBSD: x68kReg.h,v 1.2 2020/04/10 16:49:36 tsutsui Exp $ */
/*-------------------------------------------------------------------------
* Copyright (c) 1996 Yasushi Yamasaki
* All rights reserved.
@@ -11,11 +11,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 Yasushi Yamasaki
- * 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: xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kText.c
diff -u xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kText.c:1.1.1.1 xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kText.c:1.2
--- xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kText.c:1.1.1.1 Thu Jun 9 09:07:59 2016
+++ xsrc/external/mit/xorg-server.old/dist/hw/netbsd/x68k/x68kText.c Fri Apr 10 16:49:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kText.c,v 1.1.1.1 2016/06/09 09:07:59 mrg Exp $ */
+/* $NetBSD: x68kText.c,v 1.2 2020/04/10 16:49:36 tsutsui Exp $ */
/*-------------------------------------------------------------------------
* Copyright (c) 1996 Yasushi Yamasaki
* All rights reserved.
@@ -11,11 +11,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 Yasushi Yamasaki
- * 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: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h:1.3 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h:1.4
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h:1.3 Sun Sep 11 03:55:57 2016
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68k.h Fri Apr 10 16:49:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68k.h,v 1.3 2016/09/11 03:55:57 tsutsui Exp $ */
+/* $NetBSD: x68k.h,v 1.4 2020/04/10 16:49:36 tsutsui Exp $ */
/*-------------------------------------------------------------------------
* Copyright (c) 1996 Yasushi Yamasaki
* All rights reserved.
@@ -11,11 +11,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 Yasushi Yamasaki
- * 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: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kConfig.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kConfig.c:1.3 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kConfig.c:1.4
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kConfig.c:1.3 Tue Mar 4 12:11:59 2014
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kConfig.c Fri Apr 10 16:49:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kConfig.c,v 1.3 2014/03/04 12:11:59 tsutsui Exp $ */
+/* $NetBSD: x68kConfig.c,v 1.4 2020/04/10 16:49:36 tsutsui Exp $ */
/*-------------------------------------------------------------------------
* Copyright (c) 1996 Yasushi Yamasaki
* All rights reserved.
@@ -11,11 +11,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 Yasushi Yamasaki
- * 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: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c:1.3 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c:1.4
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c:1.3 Sun Sep 11 03:55:57 2016
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c Fri Apr 10 16:49:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kInit.c,v 1.3 2016/09/11 03:55:57 tsutsui Exp $ */
+/* $NetBSD: x68kInit.c,v 1.4 2020/04/10 16:49:36 tsutsui Exp $ */
/*-------------------------------------------------------------------------
* Copyright (c) 1996 Yasushi Yamasaki
* All rights reserved.
@@ -11,11 +11,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 Yasushi Yamasaki
- * 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: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c:1.3 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c:1.4
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c:1.3 Sun Sep 11 03:55:57 2016
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c Fri Apr 10 16:49:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kKbd.c,v 1.3 2016/09/11 03:55:57 tsutsui Exp $ */
+/* $NetBSD: x68kKbd.c,v 1.4 2020/04/10 16:49:36 tsutsui Exp $ */
/*-------------------------------------------------------------------------
* Copyright (c) 1996 Yasushi Yamasaki
* All rights reserved.
@@ -11,11 +11,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 Yasushi Yamasaki
- * 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: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c:1.3 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c:1.4
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c:1.3 Sun Sep 11 03:55:57 2016
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c Fri Apr 10 16:49:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kMouse.c,v 1.3 2016/09/11 03:55:57 tsutsui Exp $ */
+/* $NetBSD: x68kMouse.c,v 1.4 2020/04/10 16:49:36 tsutsui Exp $ */
/*-------------------------------------------------------------------------
* Copyright (c) 1996 Yasushi Yamasaki
* All rights reserved.
@@ -11,11 +11,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 Yasushi Yamasaki
- * 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: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c:1.2 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c:1.3
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c:1.2 Tue Aug 30 07:50:55 2016
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c Fri Apr 10 16:49:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kFb.c,v 1.2 2016/08/30 07:50:55 mrg Exp $ */
+/* $NetBSD: x68kFb.c,v 1.3 2020/04/10 16:49:36 tsutsui Exp $ */
/*-------------------------------------------------------------------------
* Copyright (c) 1996 Yasushi Yamasaki
* All rights reserved.
@@ -11,11 +11,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 Yasushi Yamasaki
- * 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: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kText.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kText.c:1.2 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kText.c:1.3
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kText.c:1.2 Tue Aug 30 07:50:55 2016
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kText.c Fri Apr 10 16:49:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kText.c,v 1.2 2016/08/30 07:50:55 mrg Exp $ */
+/* $NetBSD: x68kText.c,v 1.3 2020/04/10 16:49:36 tsutsui Exp $ */
/*-------------------------------------------------------------------------
* Copyright (c) 1996 Yasushi Yamasaki
* All rights reserved.
@@ -11,11 +11,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 Yasushi Yamasaki
- * 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: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c:1.4 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c:1.5
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c:1.4 Tue Aug 30 07:50:55 2016
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c Fri Apr 10 16:49:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kGraph.c,v 1.4 2016/08/30 07:50:55 mrg Exp $ */
+/* $NetBSD: x68kGraph.c,v 1.5 2020/04/10 16:49:36 tsutsui Exp $ */
/*-------------------------------------------------------------------------
* Copyright (c) 1996 Yasushi Yamasaki
* All rights reserved.
@@ -11,11 +11,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 Yasushi Yamasaki
- * 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: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kIo.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kIo.c:1.1 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kIo.c:1.2
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kIo.c:1.1 Sat Mar 1 19:34:47 2014
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kIo.c Fri Apr 10 16:49:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kIo.c,v 1.1 2014/03/01 19:34:47 tsutsui Exp $ */
+/* $NetBSD: x68kIo.c,v 1.2 2020/04/10 16:49:36 tsutsui Exp $ */
/*-------------------------------------------------------------------------
* Copyright (c) 1996 Yasushi Yamasaki
* All rights reserved.
@@ -11,11 +11,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 Yasushi Yamasaki
- * 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: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKeyMap.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKeyMap.c:1.1 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKeyMap.c:1.2
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKeyMap.c:1.1 Sat Mar 1 19:34:47 2014
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKeyMap.c Fri Apr 10 16:49:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kKeyMap.c,v 1.1 2014/03/01 19:34:47 tsutsui Exp $ */
+/* $NetBSD: x68kKeyMap.c,v 1.2 2020/04/10 16:49:36 tsutsui Exp $ */
/*-------------------------------------------------------------------------
* Copyright (c) 1996 Yasushi Yamasaki
* All rights reserved.
@@ -11,11 +11,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 Yasushi Yamasaki
- * 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: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kReg.h
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kReg.h:1.1 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kReg.h:1.2
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kReg.h:1.1 Sat Mar 1 19:34:47 2014
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kReg.h Fri Apr 10 16:49:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kReg.h,v 1.1 2014/03/01 19:34:47 tsutsui Exp $ */
+/* $NetBSD: x68kReg.h,v 1.2 2020/04/10 16:49:36 tsutsui Exp $ */
/*-------------------------------------------------------------------------
* Copyright (c) 1996 Yasushi Yamasaki
* All rights reserved.
@@ -11,11 +11,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 Yasushi Yamasaki
- * 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
