From 68b68523549fb44e45c9320d3ff994e07d00c128 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 5 Mar 2004 13:40:49 +0000 Subject: 23. Merged with XFree86 4.4.0. Added changes that went into infected files. 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). --- man/js_x.man | 2 +- src/js_x.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/man/js_x.man b/man/js_x.man index d8fbcce..5cc2914 100644 --- a/man/js_x.man +++ b/man/js_x.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/jamstudio/js_x.man,v 1.2 2003/02/24 03:24:15 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/jamstudio/js_x.man,v 1.1 2002/11/11 01:18:08 alanh Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH JS_X __drivermansuffix__ __vendorversion__ diff --git a/src/js_x.c b/src/js_x.c index 04c4170..8b73c5e 100644 --- a/src/js_x.c +++ b/src/js_x.c @@ -20,7 +20,7 @@ * PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/input/jamstudio/js_x.c,v 1.4 2003/11/03 05:11:47 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/input/jamstudio/js_x.c,v 1.3tsi Exp $ */ #include #include "xf86Version.h" -- cgit v1.2.3