diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-04 17:47:14 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-04 17:47:14 +0000 |
| commit | 214ca283749b9fc6864f20bf985cc58d0057c737 (patch) | |
| tree | dd1ed2f32f1064cff14fb6aa71c19a01e9f9c5bd /include/X11 | |
| parent | 2eadcf4eb451a125e9fc7c5fc9b4d09024019316 (diff) | |
18. Merged in XFree86 code up to 4.4.0 including changes to files that hadxo-6_7_0XPRINT_BEGINXPRINT_BASEXORG-TM-CYGWIN-MERGEXORG-TM-CYGWIN-LAST-MERGEXORG-RELEASE-1-TM-MERGEXORG-RELEASE-1-TM-CLOSEDXORG-RELEASE-1-TM-BASEXORG-RELEASE-1-STSF-FORKXORG-RELEASE-1-MERGEXORG-CYGWIN-MERGEXORG-CYGWIN-LAST-MERGEXORG-6_7_0IPv6-REVIEW-BASE
a changed license. There was only one change which happened to be from
me (Egbert Eich).
Diffstat (limited to 'include/X11')
| -rw-r--r-- | include/X11/extensions/XKBbells.h | 2 | ||||
| -rw-r--r-- | include/X11/extensions/XKBconfig.h | 2 | ||||
| -rw-r--r-- | include/X11/extensions/XKBfile.h | 2 | ||||
| -rw-r--r-- | include/X11/extensions/XKBrules.h | 2 | ||||
| -rw-r--r-- | include/X11/extensions/XKMformat.h | 2 |
5 files changed, 5 insertions, 5 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 |