From 46293a1716e968962a505ca1c0450556b6b38623 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 5 Mar 2004 13:39:44 +0000 Subject: 23. Merged with XFree86 4.4.0. Added changes that went into infected files. Reverted darwin/bundle/**/Credits.rtf to XFree86 versions to avoid future conflicts on ASCII but not humal readable files. (There should probably be separate CreditsXorg.rtf files) (Egbert Eich). --- include/X11/extensions/XKBbells.h | 2 +- include/X11/extensions/XKBconfig.h | 2 +- include/X11/extensions/XKBfile.h | 2 +- include/X11/extensions/XKBrules.h | 2 +- include/X11/extensions/XKMformat.h | 2 +- src/XKBfileInt.h | 2 +- src/cout.c | 2 +- src/maprules.c | 2 +- src/srvmisc.c | 2 +- src/xkbatom.c | 2 +- src/xkbbells.c | 2 +- src/xkbconfig.c | 2 +- src/xkbdraw.c | 2 +- src/xkberrs.c | 2 +- src/xkbmisc.c | 2 +- src/xkbout.c | 2 +- src/xkbtext.c | 2 +- src/xkmout.c | 2 +- src/xkmread.c | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/include/X11/extensions/XKBbells.h b/include/X11/extensions/XKBbells.h index b38568f..16a9275 100644 --- a/include/X11/extensions/XKBbells.h +++ b/include/X11/extensions/XKBbells.h @@ -27,7 +27,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/XKBbells.h,v 3.3 2003/11/17 22:20:23 dawes Exp $ */ +/* $XFree86$ */ #define XkbBN_Info "Info" #define XkbBN_Warning "Warning" diff --git a/include/X11/extensions/XKBconfig.h b/include/X11/extensions/XKBconfig.h index c59e992..fbc6a60 100644 --- a/include/X11/extensions/XKBconfig.h +++ b/include/X11/extensions/XKBconfig.h @@ -27,7 +27,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/XKBconfig.h,v 3.6 2003/11/17 22:20:23 dawes Exp $ */ +/* $XFree86: xc/lib/xkbfile/XKBconfig.h,v 3.5 2001/01/17 19:43:39 dawes Exp $ */ typedef struct _XkbConfigRtrn *XkbConfigRtrnPtr; diff --git a/include/X11/extensions/XKBfile.h b/include/X11/extensions/XKBfile.h index b894da0..bbd7e6f 100644 --- a/include/X11/extensions/XKBfile.h +++ b/include/X11/extensions/XKBfile.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/xkbfile/XKBfile.h,v 3.7 2003/11/17 22:20:23 dawes Exp $ */ +/* $XFree86: xc/lib/xkbfile/XKBfile.h,v 3.6 2003/10/24 16:33:09 tsi Exp $ */ #ifndef _XKBFILE_H_ #define _XKBFILE_H_ 1 diff --git a/include/X11/extensions/XKBrules.h b/include/X11/extensions/XKBrules.h index 5ded708..0d77ca3 100644 --- a/include/X11/extensions/XKBrules.h +++ b/include/X11/extensions/XKBrules.h @@ -27,7 +27,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/XKBrules.h,v 3.6 2003/11/17 22:20:23 dawes Exp $ */ +/* $XFree86: xc/lib/xkbfile/XKBrules.h,v 3.5 2002/11/26 01:43:25 dawes Exp $ */ /***====================================================================***/ diff --git a/include/X11/extensions/XKMformat.h b/include/X11/extensions/XKMformat.h index 8834630..154da56 100644 --- a/include/X11/extensions/XKMformat.h +++ b/include/X11/extensions/XKMformat.h @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/XKMformat.h,v 1.2 2001/08/01 00:44:44 tsi Exp $ */ +/* $XFree86$ */ #ifndef _XKMFORMAT_H_ #define _XKMFORMAT_H_ 1 diff --git a/src/XKBfileInt.h b/src/XKBfileInt.h index 04a143c..f11c46a 100644 --- a/src/XKBfileInt.h +++ b/src/XKBfileInt.h @@ -27,7 +27,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/XKBfileInt.h,v 3.4 2003/11/17 22:20:23 dawes Exp $ */ +/* $XFree86$ */ #include "XKBfile.h" diff --git a/src/cout.c b/src/cout.c index 88b53a3..a93bee2 100644 --- a/src/cout.c +++ b/src/cout.c @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ - /* $XFree86: xc/lib/xkbfile/cout.c,v 3.9 2003/11/17 22:20:23 dawes Exp $ */ + /* $XFree86: xc/lib/xkbfile/cout.c,v 3.8 2003/02/03 20:12:00 paulo Exp $ */ #include #include diff --git a/src/maprules.c b/src/maprules.c index c588ae3..330f9fe 100644 --- a/src/maprules.c +++ b/src/maprules.c @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/maprules.c,v 3.18 2003/11/17 22:20:23 dawes Exp $ */ +/* $XFree86: xc/lib/xkbfile/maprules.c,v 3.17 2002/11/26 01:43:25 dawes Exp $ */ #include #include diff --git a/src/srvmisc.c b/src/srvmisc.c index 6eae0f1..36e5a4b 100644 --- a/src/srvmisc.c +++ b/src/srvmisc.c @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/srvmisc.c,v 3.5 2003/11/17 22:20:23 dawes Exp $ */ +/* $XFree86: xc/lib/xkbfile/srvmisc.c,v 3.4 2001/10/28 03:32:47 tsi Exp $ */ #include #include diff --git a/src/xkbatom.c b/src/xkbatom.c index f152e78..c580b88 100644 --- a/src/xkbatom.c +++ b/src/xkbatom.c @@ -71,7 +71,7 @@ SOFTWARE. THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/xkbatom.c,v 3.9 2003/11/17 22:20:23 dawes Exp $ */ +/* $XFree86: xc/lib/xkbfile/xkbatom.c,v 3.8 2001/12/14 19:57:03 dawes Exp $ */ #include #include diff --git a/src/xkbbells.c b/src/xkbbells.c index f425b93..62fb1af 100644 --- a/src/xkbbells.c +++ b/src/xkbbells.c @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/xkbbells.c,v 1.2 2003/11/17 22:20:23 dawes Exp $ */ +/* $XFree86$ */ #include #include diff --git a/src/xkbconfig.c b/src/xkbconfig.c index 0e480b4..34470ea 100644 --- a/src/xkbconfig.c +++ b/src/xkbconfig.c @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/xkbconfig.c,v 3.8 2003/11/17 22:20:23 dawes Exp $ */ +/* $XFree86: xc/lib/xkbfile/xkbconfig.c,v 3.7 2001/11/30 12:11:51 eich Exp $ */ #include #include diff --git a/src/xkbdraw.c b/src/xkbdraw.c index 9218bc5..601e752 100644 --- a/src/xkbdraw.c +++ b/src/xkbdraw.c @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/xkbdraw.c,v 1.4 2003/11/17 22:20:23 dawes Exp $ */ +/* $XFree86: xc/lib/xkbfile/xkbdraw.c,v 1.3 2001/07/29 05:01:13 tsi Exp $ */ #include #include diff --git a/src/xkberrs.c b/src/xkberrs.c index d12467f..351a8da 100644 --- a/src/xkberrs.c +++ b/src/xkberrs.c @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/xkberrs.c,v 3.5 2002/11/08 13:35:43 alanh Exp $ */ +/* $XFree86: xc/lib/xkbfile/xkberrs.c,v 3.4 2001/07/29 05:01:13 tsi Exp $ */ #include #include diff --git a/src/xkbmisc.c b/src/xkbmisc.c index 2a6d836..1b83041 100644 --- a/src/xkbmisc.c +++ b/src/xkbmisc.c @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/xkbmisc.c,v 1.8 2003/11/17 22:20:24 dawes Exp $ */ +/* $XFree86: xc/lib/xkbfile/xkbmisc.c,v 1.7 2003/07/16 02:31:10 dawes Exp $ */ #include #include diff --git a/src/xkbout.c b/src/xkbout.c index d688aca..3e81d64 100644 --- a/src/xkbout.c +++ b/src/xkbout.c @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/xkbout.c,v 3.10 2003/11/17 22:20:24 dawes Exp $ */ +/* $XFree86: xc/lib/xkbfile/xkbout.c,v 3.9 2001/10/28 03:32:47 tsi Exp $ */ #include #include diff --git a/src/xkbtext.c b/src/xkbtext.c index fc593e7..027642a 100644 --- a/src/xkbtext.c +++ b/src/xkbtext.c @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/xkbtext.c,v 3.12 2003/11/17 22:20:24 dawes Exp $ */ +/* $XFree86: xc/lib/xkbfile/xkbtext.c,v 3.11 2002/12/21 18:49:02 paulo Exp $ */ #include #include diff --git a/src/xkmout.c b/src/xkmout.c index 45c9147..02dad31 100644 --- a/src/xkmout.c +++ b/src/xkmout.c @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/xkmout.c,v 1.6 2003/11/17 22:20:24 dawes Exp $ */ +/* $XFree86: xc/lib/xkbfile/xkmout.c,v 1.5 2001/07/25 15:04:58 dawes Exp $ */ #include #include diff --git a/src/xkmread.c b/src/xkmread.c index b7a08e2..cd38cbb 100644 --- a/src/xkmread.c +++ b/src/xkmread.c @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/xkmread.c,v 1.7 2003/11/17 22:20:24 dawes Exp $ */ +/* $XFree86: xc/lib/xkbfile/xkmread.c,v 1.6 2002/02/13 22:09:42 herrb Exp $ */ #include -- cgit v1.2.3