Commit 81fa26b0 authored by Egbert Eich's avatar Egbert Eich
Browse files

Merging XORG-CURRENT into trunk

parent 99566aec
/* $XdotOrg$ */
/************************************************************ /************************************************************
Copyright (c) 1996 by Silicon Graphics Computer Systems, Inc. Copyright (c) 1996 by Silicon Graphics Computer Systems, Inc.
...@@ -23,7 +24,7 @@ ...@@ -23,7 +24,7 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE. 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 <stdio.h>
#include <stdlib.h> #include <stdlib.h>
...@@ -49,7 +50,7 @@ ...@@ -49,7 +50,7 @@
#define DFLT_XKB_CONFIG_ROOT "/usr/X11R6/lib/X11/xkb" #define DFLT_XKB_CONFIG_ROOT "/usr/X11R6/lib/X11/xkb"
#endif #endif
#ifndef DFLT_XKB_RULES_FILE #ifndef DFLT_XKB_RULES_FILE
#define DFLT_XKB_RULES_FILE "xfree86" #define DFLT_XKB_RULES_FILE __XKBDEFRULES__
#endif #endif
#ifndef DFLT_XKB_LAYOUT #ifndef DFLT_XKB_LAYOUT
#define DFLT_XKB_LAYOUT "us" #define DFLT_XKB_LAYOUT "us"
......
.\" .\"
.\" $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__ .TH SETXKBMAP 1 __xorgversion__
.SH NAME .SH NAME
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment