xserver: Branch 'master'

[Peter Hutterer]

 hw/xnest/Args.c |    5 -----
 1 file changed, 5 deletions(-)

New commits:
commit 2ddbfd345786aa39b6ccaed82a1ca5c145284ee3
Author: Peter Hutterer <peter at cs.unisa.edu.au>
Date:   Tue Apr 22 16:31:44 2008 +0930

    xnest: re-enable XKB support. #10015
    
    XKB was disabled in 08928afb0500d46b0caa0a1d1244dee2ed80e6a0, with the comment
    "Disable XKB, as we can't yet use it". Seems like "yet" is over, running GNOME
    and changing XKB settings seems to work in Xnest now.
    
    X.Org Bug 10015 <https://bugs.freedesktop.org/show_bug.cgi?id=10015>

diff --git a/hw/xnest/Args.c b/hw/xnest/Args.c
index f061f9e..209f175 100644
--- a/hw/xnest/Args.c
+++ b/hw/xnest/Args.c
@@ -57,11 +57,6 @@ void ddxInitGlobals(void)
     extern Bool noCompositeExtension;
     noCompositeExtension = TRUE;
 #endif
-
-#ifdef XKB
-    extern Bool noXkbExtension;
-    noXkbExtension = TRUE;
-#endif
 }
 
 int