diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-04 17:48:05 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-04 17:48:05 +0000 |
| commit | 4146faac20334077161e36530c88d068eaad1795 (patch) | |
| tree | 24d28d0e101a883d70ff6319c8cff1dc13dc3f9e | |
| parent | 1d3210ecf308bb10611d6629f249eb486009f000 (diff) | |
18. Merged in XFree86 code up to 4.4.0 including changes to files that hadXPRINT_BASEXORG-RELEASE-1-TM-MERGEXORG-RELEASE-1-TM-BASEIPv6-REVIEW-BASEIPv6-REVIEW
a changed license. There was only one change which happened to be from
me (Egbert Eich).
| -rw-r--r-- | man/js_x.man | 2 | ||||
| -rw-r--r-- | 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__ @@ -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 <sys/types.h> #include "xf86Version.h" |