Commit 22ee6b57 authored by Egbert Eich's avatar Egbert Eich
Browse files

Merged changes from RELEASE-1 branch

parent 7d78f0b7
/* $XdotOrg$ */
/************************************************************ /************************************************************
Copyright (c) 1996 by Silicon Graphics Computer Systems, Inc. Copyright (c) 1996 by Silicon Graphics Computer Systems, Inc.
...@@ -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"
......
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