xserver: Branch 'master'

[Peter Hutterer]

 dix/events.c |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit 26f701704b4e536cd91bd8a9f7d2194793471998
Author: Peter Hutterer <peter.hutterer at redhat.com>
Date:   Wed Nov 12 16:53:29 2008 +1000

    dix: remove duplicate line in EnterLeaveEvent.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at redhat.com>

diff --git a/dix/events.c b/dix/events.c
index 05f9947..33936bd 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -4325,8 +4325,6 @@ EnterLeaveEvent(
     devEnterLeave = (deviceEnterNotify*)&event;
     devEnterLeave->type = (type == EnterNotify) ? DeviceEnterNotify :
         DeviceLeaveNotify;
-    devEnterLeave->type = (type == EnterNotify) ? DeviceEnterNotify :
-        DeviceLeaveNotify;
     devEnterLeave->mode |= (event.u.enterLeave.flags << 4);
     devEnterLeave->deviceid = mouse->id;
     mskidx = mouse->id;