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 | 5de6790c481fd62e8372dc7c02b22d55310b9da1 (patch) | |
| tree | 5f6a195fd9fa2596609518b4a30168b198d52887 | |
| parent | 4ccaf67b4e81207fd9e2f314dff7191f3e1e128b (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/palmax.man | 2 | ||||
| -rw-r--r-- | src/xf86Palmax.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/man/palmax.man b/man/palmax.man index 33d2dca..aec26fe 100644 --- a/man/palmax.man +++ b/man/palmax.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/palmax/palmax.man,v 1.1 2002/11/22 03:40:22 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/mutouch/mutouch.man,v 1.1 2001/01/24 00:06:37 dawes Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH PALMAX __drivermansuffix__ __vendorversion__ diff --git a/src/xf86Palmax.c b/src/xf86Palmax.c index 93db45b..7acfb87 100644 --- a/src/xf86Palmax.c +++ b/src/xf86Palmax.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/input/palmax/xf86Palmax.c,v 1.2 2003/06/23 17:35:49 eich Exp $ */ +/* $XFree86$ */ #include "misc.h" #include "xf86.h" |