fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-02-20 07:00:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master'

Browse source
This commit is contained in:
Peter Hutterer 2007-01-28 17:05:55 +10:30 • committed by Peter Hutterer
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 {