summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland Mainz <roland.mainz@nrubsig.org>2004-04-10 09:05:48 +0000
committerRoland Mainz <roland.mainz@nrubsig.org>2004-04-10 09:05:48 +0000
commitac93246e00b0b28fea56f5102e5e50dc1feb9a58 (patch)
tree4ae4bd80ad41dc5ee2aa721054c61db37f0813ff
parent514a6cc61dc2d50f347883b1423191e6ad0e487d (diff)
Resync to 2004-04-10 XORG-RELEASE-1 branch
-rw-r--r--setxkbmap.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/setxkbmap.c b/setxkbmap.c
index eb81cba..cf3e39d 100644
--- a/setxkbmap.c
+++ b/setxkbmap.c
@@ -1,3 +1,4 @@
+/* $XdotOrg: xc/programs/setxkbmap/setxkbmap.c,v 1.1.4.1.6.2 2004/04/02 21:47:35 eich Exp $ */
/************************************************************
Copyright (c) 1996 by Silicon Graphics Computer Systems, Inc.
@@ -49,7 +50,7 @@
#define DFLT_XKB_CONFIG_ROOT "/usr/X11R6/lib/X11/xkb"
#endif
#ifndef DFLT_XKB_RULES_FILE
-#define DFLT_XKB_RULES_FILE "xfree86"
+#define DFLT_XKB_RULES_FILE __XKBDEFRULES__
#endif
#ifndef DFLT_XKB_LAYOUT
#define DFLT_XKB_LAYOUT "us"