diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-23 19:54:30 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-23 19:54:30 +0000 |
| commit | 2fb588620030ad393f8500d60e16144d59e4effe (patch) | |
| tree | 07262cbe15a40e5aeae54f62751260f83243ab79 /hw/xnest/Keyboard.c | |
| parent | 0664db19bf37f9dd69cca6adff4e238e310c3092 (diff) | |
Merging XORG-CURRENT into trunk
Diffstat (limited to 'hw/xnest/Keyboard.c')
| -rw-r--r-- | hw/xnest/Keyboard.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/hw/xnest/Keyboard.c b/hw/xnest/Keyboard.c index eb9291878..d63faca52 100644 --- a/hw/xnest/Keyboard.c +++ b/hw/xnest/Keyboard.c @@ -1,4 +1,5 @@ /* $Xorg: Keyboard.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ +/* $XdotOrg$ */ /* Copyright 1993 by Davor Matic @@ -12,7 +13,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Keyboard.c,v 1.10 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Keyboard.c,v 1.9 2003/09/13 21:33:09 dawes Exp $ */ #define NEED_EVENTS #include "X.h" @@ -65,7 +66,7 @@ extern Status XkbGetControls( #define XKB_CONFIG_FILE "X0-config.keyboard" #endif #ifndef XKB_DFLT_RULES_FILE -#define XKB_DFLT_RULES_FILE "xfree86" +#define XKB_DFLT_RULES_FILE __XKBDEFRULES__ #endif #ifndef XKB_DFLT_KB_LAYOUT #define XKB_DFLT_KB_LAYOUT "us" |