diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-23 19:54:37 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-23 19:54:37 +0000 |
| commit | 81fa26b0cde086ec0707096a942d773e7d6411ee (patch) | |
| tree | 173694aec0bc030ec7492f054b417c54cf12f0b6 | |
| parent | 99566aece09d0b750267f48dc39552bbd1aae4bf (diff) | |
Merging XORG-CURRENT into trunkxprint_packagertest_20041217_basexprint_packagertest_20041125_basesco_port_update-baserel-0-6-1lg3d-rel-0-7-0lg3d-rel-0-6-2lg3d-baseXORG-6_8_99_903XORG-6_8_99_902XORG-6_8_99_901XORG-6_8_99_900XORG-6_8_99_9XORG-6_8_99_8XORG-6_8_99_7XORG-6_8_99_6XORG-6_8_99_5XORG-6_8_99_4XORG-6_8_99_3XORG-6_8_99_2XORG-6_8_99_16XORG-6_8_99_15XORG-6_8_99_14XORG-6_8_99_13XORG-6_8_99_12XORG-6_8_99_11XORG-6_8_99_10XORG-6_8_99_1XORG-6_8_2XORG-6_8_1_904XORG-6_8_1_903XORG-6_8_1_902XORG-6_8_1_901XORG-6_8_1XORG-6_8_0XORG-6_7_99_904XORG-6_7_99_903XORG-6_7_99_902XORG-6_7_99_901XORG-6_7_99_2XORG-6_7_99_1XACE-SELINUX-MERGExprint_packagertest_20041217xprint_packagertest_20041125sco_port_updatelg3d-masterlg3d-eventlg3d-dev-0-7-1lg3d-dev-0-7-0lg3d-dev-0-6-latestlg3d-dev-0-6-2lg3d-dev-0-6-1-latestlg3d-dev-0-6-1-currentlg3d-dev-0-6-1-1lg3d-dev-0-6-1lg3dXORG-6_8-branchCOMPOSITEWRAP
| -rw-r--r-- | setxkbmap.c | 5 | ||||
| -rw-r--r-- | 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 |