diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:49 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:49 +0000 |
| commit | 68b68523549fb44e45c9320d3ff994e07d00c128 (patch) | |
| tree | 24d28d0e101a883d70ff6319c8cff1dc13dc3f9e /src/js_x.c | |
| parent | 1d3210ecf308bb10611d6629f249eb486009f000 (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).
Diffstat (limited to 'src/js_x.c')
| -rw-r--r-- | src/js_x.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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" |