From 81fa26b0cde086ec0707096a942d773e7d6411ee Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Fri, 23 Apr 2004 19:54:37 +0000
Subject: Merging XORG-CURRENT into trunk

---
 setxkbmap.c   | 5 +++--
 setxkbmap.man | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/setxkbmap.c b/setxkbmap.c
index 16d12bf..2c09ddb 100644
--- a/setxkbmap.c
+++ b/setxkbmap.c
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
 /************************************************************
  Copyright (c) 1996 by Silicon Graphics Computer Systems, Inc.
 
@@ -23,7 +24,7 @@
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
  ********************************************************/
-/* $XFree86: xc/programs/setxkbmap/setxkbmap.c,v 3.8 2003/11/17 22:20:50 dawes Exp $ */
+/* $XFree86: xc/programs/setxkbmap/setxkbmap.c,v 3.7 2003/01/20 04:15:08 dawes Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -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"
diff --git a/setxkbmap.man b/setxkbmap.man
index 44625ed..c21eca6 100644
--- a/setxkbmap.man
+++ b/setxkbmap.man
@@ -1,5 +1,5 @@
 .\"
-.\" $XFree86: xc/programs/setxkbmap/setxkbmap.man,v 3.7 2003/05/29 22:16:23 herrb Exp $
+.\" $XFree86: xc/programs/setxkbmap/setxkbmap.man,v 3.6 2003/01/20 04:15:08 dawes Exp $
 .\"
 .TH SETXKBMAP 1 __xorgversion__
 .SH NAME
-- 
cgit v1.2.3