summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-05 13:40:51 +0000
committerEgbert Eich <eich@suse.de>2004-03-05 13:40:51 +0000
commit21ddd94c03844c82089d8fb4634a6fa8a1773928 (patch)
tree050aeb917d625b1073dce53ce87e9b44701617b1
parentfcbb344e2c68f061e70bc606d8a1909bce1aa03f (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).
-rw-r--r--src/xf86Summa.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xf86Summa.c b/src/xf86Summa.c
index 06f36ec..37b509b 100644
--- a/src/xf86Summa.c
+++ b/src/xf86Summa.c
@@ -24,7 +24,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/input/summa/xf86Summa.c,v 1.17 2003/11/17 22:20:39 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/input/summa/xf86Summa.c,v 1.16 2003/11/03 05:11:49 tsi Exp $ */
#if 0
static const char identification[] = "$Identification: 18 $";