From 346b2ddb0eb625419d81bbac2b359f31575c86cf Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@epoch.ncsc.mil>
Date: Tue, 4 May 2004 19:44:05 +0000
Subject: Merge the new release from HEAD

---
 setxkbmap.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setxkbmap.c b/setxkbmap.c
index eb81cba..ba4a2b8 100644
--- a/setxkbmap.c
+++ b/setxkbmap.c
@@ -1,3 +1,4 @@
+/* $XdotOrg: xc/programs/setxkbmap/setxkbmap.c,v 1.2 2004/04/23 19:54:37 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"
-- 
cgit v1.2.3