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 | a1f07124d2e4f98951b05bc3be6658fb144c8c48 (patch) | |
| tree | de2c7c792ddd1de734013aaca8376adb64641adf | |
| parent | 958562709a025168e7144b46ce128b8a928bce22 (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-- | src/xf86Jstk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xf86Jstk.c b/src/xf86Jstk.c index 54bb2dc..65315c4 100644 --- a/src/xf86Jstk.c +++ b/src/xf86Jstk.c @@ -22,7 +22,7 @@ * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/input/joystick/xf86Jstk.c,v 1.6 2001/12/26 21:51:59 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/input/joystick/xf86Jstk.c,v 1.5 2001/11/26 16:25:53 dawes Exp $ */ #include <xf86Version.h> |