From c3753ba83fc9f3ae414a5a70819d6f30433d9308 Mon Sep 17 00:00:00 2001
From: Kaleb Keithley <kaleb@freedesktop.org>
Date: Sat, 20 Dec 2003 00:28:32 +0000
Subject: merge XFree86 RC2 (4.3.99.902) from vendor branch

---
 expr.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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		}
 };
 
-- 
cgit v1.2.3