diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:50 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:50 +0000 |
| commit | 708dcea9fe20ff6e26803965130bb2864d0dc7c7 (patch) | |
| tree | e8f2e86a22e24f482c4b98590db39879da92d001 | |
| parent | 2b8aa142e2eb0de6e3c8389f2eb01178e61eebcf (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-- | man/magictouch.man | 2 | ||||
| -rw-r--r-- | src/xf86MagicTouch.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/man/magictouch.man b/man/magictouch.man index 29a78a4..7c68d62 100644 --- a/man/magictouch.man +++ b/man/magictouch.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/magictouch/magictouch.man,v 1.1 2001/07/03 15:13:57 paulo Exp $ +.\" $XFree86$ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH VOID __drivermansuffix__ __vendorversion__ diff --git a/src/xf86MagicTouch.c b/src/xf86MagicTouch.c index c099ecc..0d5f2f6 100644 --- a/src/xf86MagicTouch.c +++ b/src/xf86MagicTouch.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/hw/xfree86/input/magictouch/xf86MagicTouch.c,v 1.3 2003/01/12 03:55:50 tsi Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/input/magictouch/xf86MagicTouch.c,v 1.2tsi Exp $ */ #include <xf86Version.h> |