diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-04 17:48:52 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-04 17:48:52 +0000 |
| commit | 514a6cc61dc2d50f347883b1423191e6ad0e487d (patch) | |
| tree | 3d6256a1b3af25f0fa17f2458749c8ee1c3d688c | |
| parent | 77f887fff3dc6fcf948fb93a7bf9d77890fbd47d (diff) | |
18. Merged in XFree86 code up to 4.4.0 including changes to files that hadXPRINT_BASEXORG-RELEASE-1-TM-MERGEXORG-RELEASE-1-TM-BASEIPv6-REVIEW-BASEIPv6-REVIEW
a changed license. There was only one change which happened to be from
me (Egbert Eich).
| -rw-r--r-- | setxkbmap.c | 2 | ||||
| -rw-r--r-- | setxkbmap.man | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/setxkbmap.c b/setxkbmap.c index 16d12bf..eb81cba 100644 --- a/setxkbmap.c +++ b/setxkbmap.c @@ -23,7 +23,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> 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 |