diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:38:52 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:38:52 +0000 |
| commit | f3cd1bca7780c6edfac6d199490dfafafa5e5813 (patch) | |
| tree | 53b40ad34d3f3336dcca03bdd95c751321018269 | |
| parent | 408ada0589b76e0041f4c23ef92955b60ef215ef (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-- | xf86bigfont.h | 2 | ||||
| -rw-r--r-- | xf86bigfstr.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/xf86bigfont.h b/xf86bigfont.h index 7d6d163..9c47996 100644 --- a/xf86bigfont.h +++ b/xf86bigfont.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/xf86bigfont.h,v 1.2 2001/08/01 00:44:35 tsi Exp $ */ +/* $XFree86: xc/include/extensions/xf86bigfont.h,v 1.1 2000/02/08 17:18:25 dawes Exp $ */ /* * Declarations for the BIGFONT extension. * diff --git a/xf86bigfstr.h b/xf86bigfstr.h index 9fce90b..7ba199b 100644 --- a/xf86bigfstr.h +++ b/xf86bigfstr.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/xf86bigfstr.h,v 1.3 2001/08/01 00:44:35 tsi Exp $ */ +/* $XFree86: xc/include/extensions/xf86bigfstr.h,v 1.2 2000/02/29 03:09:00 dawes Exp $ */ /* * Declarations of request structures for the BIGFONT extension. * |