[xorg-commit-diffs] xc/programs/Xserver/hw/xfree86/input/joystick xf86Jstk.c, 1.1.4.1, 1.1.4.2

[Egbert Eich]

Committed by: eich

Update of /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/joystick
In directory pdx:/home/eich/tstbuild/xc/programs/Xserver/hw/xfree86/input/joystick

Modified Files:
      Tag: XORG-CURRENT
	xf86Jstk.c 
Log Message:
2004-04-15  Egbert Eich  <eich at freedesktop.org>
        Merged changes from RELEASE-1 branch
	


Index: xf86Jstk.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/joystick/xf86Jstk.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/xf86Jstk.c	5 Mar 2004 13:40:49 -0000	1.1.4.1
+++ b/xf86Jstk.c	15 Apr 2004 10:17:03 -0000	1.1.4.2
@@ -770,7 +770,7 @@
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
+	XORG_VERSION_CURRENT,
 	1, 0, 0,
 	ABI_CLASS_XINPUT,
 	ABI_XINPUT_VERSION,