xserver: Branch 'master'

[Peter Hutterer]

 hw/kdrive/src/kinput.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 656d5d98855eb608ec6581f8c574f343a216ea32
Author: Peter Hutterer <peter at cs.unisa.edu.au>
Date:   Wed Jun 11 17:32:59 2008 +0930

    kdrive: fix wrong use of &, should be | instead.
    
    Fallout from 26e7e69ab893d1f2b35213250ada40ec90944f62

diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
index 3f81b65..8308752 100644
--- a/hw/kdrive/src/kinput.c
+++ b/hw/kdrive/src/kinput.c
@@ -2107,7 +2107,7 @@ KdEnqueuePointerEvent(KdPointerInfo *pi, unsigned long flags, int rx, int ry,
     if (flags & KD_MOUSE_DELTA)
     {
         if (x || y || z)
-            dixflags = POINTER_RELATIVE & POINTER_ACCELERATE;
+            dixflags = POINTER_RELATIVE | POINTER_ACCELERATE;
     } else if (x != pi->dixdev->last.valuators[0] ||
                 y != pi->dixdev->last.valuators[1])
             dixflags = POINTER_ABSOLUTE;