xserver: Branch 'master'

[Adam Jackson]

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

New commits:
commit 2c5332872f808e7a646a63ae7ec63a2b80f83ee7
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Oct 8 13:39:49 2008 -0400

    s/kdDontZap/kdAllowZap/

diff --git a/hw/kdrive/src/kdrive.h b/hw/kdrive/src/kdrive.h
index 3987cb0..8e1998e 100644
--- a/hw/kdrive/src/kdrive.h
+++ b/hw/kdrive/src/kdrive.h
@@ -393,7 +393,7 @@ extern Bool		kdEnabled;
 extern Bool		kdSwitchPending;
 extern Bool		kdEmulateMiddleButton;
 extern Bool		kdDisableZaphod;
-extern Bool		kdDontZap;
+extern Bool		kdAllowZap;
 extern int		kdVirtualTerminal;
 extern char		*kdSwitchCmd;
 extern KdOsFuncs	*kdOsFuncs;