diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-04-22 18:04:05 +0930 |
|---|---|---|
| committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-04-22 18:04:05 +0930 |
| commit | 8190ef87547b704848231bde10b1cdffc6442790 (patch) | |
| tree | 29cb6d5bdefcee879d103953a140373635726f17 /hw/xnest | |
| parent | 179a082c26f9e562492ee2e59e7f44f949f39f9c (diff) | |
| parent | 2ddbfd345786aa39b6ccaed82a1ca5c145284ee3 (diff) | |
Merge branch 'master' into mpx
Conflicts:
Xext/EVI.c
Xext/appgroup.c
Xext/cup.c
Xext/mitmisc.c
Xext/sampleEVI.c
dix/window.c
Diffstat (limited to 'hw/xnest')
| -rw-r--r-- | hw/xnest/Args.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/hw/xnest/Args.c b/hw/xnest/Args.c index f061f9e80..209f175ab 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 |