frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master'

This commit is contained in:
Peter Hutterer 2007-01-28 17:05:55 +10:30 committed by Peter Hutterer
parent ba547d4f6a ca5ebe3971
commit 3759254c09
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dix/getevents.c
View File

@ -549,7 +549,11 @@ GetPointerEvents(xEvent *events, DeviceIntPtr pDev, int type, int buttons,
y = valuators[1 - first_valuator];
}
else {
<<<<<<< HEAD/dix/getevents.c
y = pointer->valuator->lasty;
=======
y = pointer->valuator->lasty;
>>>>>>> ca5ebe3971d8ebcfed00c5ebcd026cdd0ce0c6ba/dix/getevents.c
}
}
else {