diff options
author | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:48 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:48 +0000 |
commit | e29a83967f6203ca11a105590ea228d5ff98e2ad (patch) | |
tree | 96ea537c648a6d4f7946f2dfc78a8f898e5c5201 | |
parent | aa0fa4c816f6e2863effe61450b487299324c034 (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/DigitalEdge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/DigitalEdge.c b/src/DigitalEdge.c index bc71334..da6bbf7 100644 --- a/src/DigitalEdge.c +++ b/src/DigitalEdge.c @@ -30,7 +30,7 @@ * Probably buggy as hell, no idea what the initialisation strings are, * no idea how to ack it. If the tablet stops responding power cycle it. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/input/digitaledge/DigitalEdge.c,v 1.9 2003/11/17 22:20:38 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/input/digitaledge/DigitalEdge.c,v 1.8 2003/09/24 03:16:58 dawes Exp $ */ #include "xf86Version.h" |