summaryrefslogtreecommitdiff
path: root/src/r128.h
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-05 13:40:19 +0000
committerEgbert Eich <eich@suse.de>2004-03-05 13:40:19 +0000
commit397653e558b5fa4936ee6c9ac1eb6acaa9cf1cbc (patch)
tree5988c3f829963dfa7315e626c4d0e72e85d76e09 /src/r128.h
parent42cbea1d05a9e44b0d560da29bff19711ebb8a94 (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/r128.h')
-rw-r--r--src/r128.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/r128.h b/src/r128.h
index 4da7168b..3b477551 100644
--- a/src/r128.h
+++ b/src/r128.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/r128.h,v 1.27 2003/11/10 18:41:20 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/r128.h,v 1.26 2003/11/06 18:37:58 tsi Exp $ */
/*
* Copyright 1999, 2000 ATI Technologies Inc., Markham, Ontario,
* Precision Insight, Inc., Cedar Park, Texas, and