Module Name: xsrc
Committed By: mrg
Date: Thu Jun 11 15:54:50 UTC 2009
Modified Files:
xsrc/external/mit/xf86-input-mouse/dist/src: mouse.c
xsrc/external/mit/xf86-input-mouse/include: config.h
Log Message:
properly merge 1.4.0
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c
cvs rdiff -u -r1.1 -r1.2 xsrc/external/mit/xf86-input-mouse/include/config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c
diff -u xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c:1.3 xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c:1.4
--- xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c:1.3 Wed Jun 10 08:58:43 2009
+++ xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c Thu Jun 11 15:54:50 2009
@@ -2527,10 +2527,6 @@
Bool automatic = FALSE;
pMse = pInfo->private;
-
- if (osInfo->SetupMouse)
- if (!osInfo->SetupMouse(pInfo))
- return FALSE;
/* Handle the "Auto" protocol. */
if (pMse->protocolID == PROT_AUTO) {
Index: xsrc/external/mit/xf86-input-mouse/include/config.h
diff -u xsrc/external/mit/xf86-input-mouse/include/config.h:1.1 xsrc/external/mit/xf86-input-mouse/include/config.h:1.2
--- xsrc/external/mit/xf86-input-mouse/include/config.h:1.1 Thu Aug 28 07:23:06 2008
+++ xsrc/external/mit/xf86-input-mouse/include/config.h Thu Jun 11 15:54:50 2009
@@ -44,19 +44,19 @@
#define PACKAGE_NAME "xf86-input-mouse"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "xf86-input-mouse 1.3.0"
+#define PACKAGE_STRING "xf86-input-mouse 1.4.0"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "xf86-input-mouse"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.3.0"
+#define PACKAGE_VERSION "1.4.0"
/* Major version of this package */
#define PACKAGE_VERSION_MAJOR 1
/* Minor version of this package */
-#define PACKAGE_VERSION_MINOR 3
+#define PACKAGE_VERSION_MINOR 4
/* Patch version of this package */
#define PACKAGE_VERSION_PATCHLEVEL 0
@@ -65,4 +65,4 @@
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "1.3.0"
+#define VERSION "1.4.0"
