summaryrefslogtreecommitdiff
path: root/src/mga_dh.c
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-05 13:40:25 +0000
committerEgbert Eich <eich@suse.de>2004-03-05 13:40:25 +0000
commitb898bcbd0a540b64d73c9fd4db2069ed6a00360f (patch)
treebfc99c3d4bdcc4ef6bb59fcca5294ef1f49e1fec /src/mga_dh.c
parent03f00bf8411e6c36d3aef1907e42a52854353101 (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/mga_dh.c')
-rw-r--r--src/mga_dh.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mga_dh.c b/src/mga_dh.c
index e283795..db4f4f2 100644
--- a/src/mga_dh.c
+++ b/src/mga_dh.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dh.c,v 1.5 2003/11/03 05:11:17 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dh.c,v 1.4tsi Exp $ */
/*********************************************************************
* G450: This is for Dual Head.
* Matrox Graphics