diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:51 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:51 +0000 |
| commit | c327d4c56a8e380ab45520a3cf4d336c8d8ac37c (patch) | |
| tree | 30b6b323dbabf0eff07c3250ebd8ff7dbbdfb41a | |
| parent | b56bded696b6fa33bacec0481774b79a5675343b (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/ur98.man | 2 | ||||
| -rw-r--r-- | src/xf86Ur-98.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/man/ur98.man b/man/ur98.man index b699a0f..9fa829e 100644 --- a/man/ur98.man +++ b/man/ur98.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/ur98/ur98.man,v 1.1 2002/11/22 03:49:15 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 UR98 __drivermansuffix__ __vendorversion__ diff --git a/src/xf86Ur-98.c b/src/xf86Ur-98.c index 66aa283..a32f124 100644 --- a/src/xf86Ur-98.c +++ b/src/xf86Ur-98.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/input/ur98/xf86Ur-98.c,v 1.2 2003/12/22 17:48:10 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/input/ur98/xf86Ur-98.c,v 1.1tsi Exp $ */ #include <sys/types.h> #include <unistd.h> |