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 | f4c272eca0942521cda640d4922716e22e7fdb78 (patch) | |
| tree | 1ec04355bf9b43a585c0219c6b5111f26cfa5f81 | |
| parent | 24880ca5a806dd6f5cd2d94efa552bbadd635e49 (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-BASEXORG-CURRENTXACE-SELINUXDAMAGE-XFIXES
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).
| -rw-r--r-- | include/X11/extensions/XKBui.h | 2 | ||||
| -rw-r--r-- | src/XKBui.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/X11/extensions/XKBui.h b/include/X11/extensions/XKBui.h index 2a8b73b..36c66df 100644 --- a/include/X11/extensions/XKBui.h +++ b/include/X11/extensions/XKBui.h @@ -26,7 +26,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbui/XKBui.h,v 3.1 2003/11/17 22:20:25 dawes Exp $ */ +/* $XFree86$ */ #include <X11/Xlib.h> #include <X11/XKBlib.h> diff --git a/src/XKBui.c b/src/XKBui.c index ed2ed3c..294bd02 100644 --- a/src/XKBui.c +++ b/src/XKBui.c @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbui/XKBui.c,v 3.7 2003/11/17 22:20:25 dawes Exp $ */ +/* $XFree86: xc/lib/xkbui/XKBui.c,v 3.6 1999/06/20 07:14:08 dawes Exp $ */ #include <X11/Xos.h> #include <stdio.h> |