Merge branch 'master'
This commit is contained in:
commit
3759254c09
|
@ -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 {
|
||||
|
|
Loading…
Reference in New Issue
Block a user