diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:39:44 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:39:44 +0000 |
| commit | 46293a1716e968962a505ca1c0450556b6b38623 (patch) | |
| tree | dd1ed2f32f1064cff14fb6aa71c19a01e9f9c5bd /include/X11/extensions/XKBconfig.h | |
| parent | 2eadcf4eb451a125e9fc7c5fc9b4d09024019316 (diff) | |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.before_20040421_xprint_branch_landingXORG-CURRENT-premerge-release-1XORG-CURRENT-CLOSEDXACE-SELINUX-BASEDAMAGE-XFIXES-BASE
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).
Diffstat (limited to 'include/X11/extensions/XKBconfig.h')
| -rw-r--r-- | include/X11/extensions/XKBconfig.h | 2 |
1 files changed, 1 insertions, 1 deletions
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; |