summaryrefslogtreecommitdiff
path: root/src/oem300.h
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-05 13:40:35 +0000
committerEgbert Eich <eich@suse.de>2004-03-05 13:40:35 +0000
commitad179e6b335b0af02b3a8195a10a7e0c8d9df713 (patch)
tree5cfea24d9eeb45447cd68cf27515f7497d120ceb /src/oem300.h
parent5b29e9b7568dd14d10c6b86b5294c3bc86424bf8 (diff)
23. Merged with XFree86 4.4.0. Added changes that went into infected files.XORG-CURRENT-premerge-release-1XACE-SELINUX-BASEDAMAGE-XFIXES-BASEDAMAGE-XFIXES
Reverted darwin/bundle/**/Credits.rtf to XFree86 versions to avoid future conflicts on ASCII but not humal readable files. (There should probably be separate CreditsXorg.rtf files) (Egbert Eich).
Diffstat (limited to 'src/oem300.h')
-rw-r--r--src/oem300.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/oem300.h b/src/oem300.h
index 0e2f2c6..7995893 100644
--- a/src/oem300.h
+++ b/src/oem300.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/oem300.h,v 1.14 2004/01/23 22:29:03 twini Exp $ */
+/* $XFree86$ */
/*
* OEM Data for 300 series
*
@@ -31,10 +31,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 Thomas Winischhofer, Vienna, Austria."
- * * 4) The name of the author may not be used to endorse or promote products
+ * * 3) 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 EXPRESSED OR