Module Name: xsrc
Committed By: mrg
Date: Wed Jun 5 07:26:13 UTC 2013
Modified Files:
xsrc/external/mit/xf86-input-mouse/dist/src: mouse.c
Log Message:
fix a merge botch.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 \
xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c
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.15 xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c:1.16
--- xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c:1.15 Wed Jun 5 07:11:16 2013
+++ xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c Wed Jun 5 07:26:12 2013
@@ -282,7 +282,7 @@ MouseCommonOptions(InputInfoPtr pInfo)
MessageType buttons_from = X_CONFIG;
char *s;
int origButtons;
- int btn;
+ int i;
pMse = pInfo->private;
