diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:39:41 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:39:41 +0000 |
| commit | 10a574ee13244352968bbe53a6622ffa31d98fa5 (patch) | |
| tree | cbe32e20196a3f7152f105c6a2a0ab82b24e0c45 /include/X11/fonts/fontenc.h | |
| parent | 0b1b9f59f2513f5e2795cba34c747b0e68f4b9b1 (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-CURRENTDAMAGE-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).
Diffstat (limited to 'include/X11/fonts/fontenc.h')
| -rw-r--r-- | include/X11/fonts/fontenc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/X11/fonts/fontenc.h b/include/X11/fonts/fontenc.h index 6145314..09472cf 100644 --- a/include/X11/fonts/fontenc.h +++ b/include/X11/fonts/fontenc.h @@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/lib/font/include/fontenc.h,v 1.8 2001/08/13 21:46:48 dawes Exp $ */ +/* $XFree86: xc/lib/font/include/fontenc.h,v 1.7 2000/11/14 16:54:45 dawes Exp $ */ /* Header for backend-independent encoding code */ |