summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-12-20 00:28:32 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-12-20 00:28:32 +0000
commitc3753ba83fc9f3ae414a5a70819d6f30433d9308 (patch)
tree03ebc7c0b29dc03a8aa11877bc427fbff2962f93
parenta153e2624e9e3e7b06fad207e8855bea617ac088 (diff)
merge XFree86 RC2 (4.3.99.902) from vendor branchXEVIE-BASE
-rw-r--r--expr.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/expr.c b/expr.c
index f48bcb9..ea6261d 100644
--- a/expr.c
+++ b/expr.c
@@ -1,3 +1,4 @@
+/* $XdotOrg: expr.c,v 1.5 2000/08/17 19:54:30 cpqbld Exp $ */
/* $Xorg: expr.c,v 1.5 2000/08/17 19:54:30 cpqbld Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
@@ -24,7 +25,7 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/xkbcomp/expr.c,v 3.7 2003/08/06 14:04:05 eich Exp $ */
+/* $XFree86: xc/programs/xkbcomp/expr.c,v 3.8 2003/12/18 14:14:37 pascal Exp $ */
#include "xkbcomp.h"
#include "tokens.h"
@@ -245,6 +246,7 @@ static LookupEntry modIndexNames[] = {
{ "mod3", Mod3MapIndex },
{ "mod4", Mod4MapIndex },
{ "mod5", Mod5MapIndex },
+ { "none", XkbNoModifier },
{ NULL, 0 }
};