diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:12 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:12 +0000 |
| commit | 505fe2ba307e9270627ca7f3cb6b4e1dbacc327b (patch) | |
| tree | ad19dfe52ca3f84a6f669acac195d296ed38ad08 /dix/dixfonts.c | |
| parent | 1b22db1ebcf1ba98ca8519fa38210e275373f8f6 (diff) | |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.
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 'dix/dixfonts.c')
| -rw-r--r-- | dix/dixfonts.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dix/dixfonts.c b/dix/dixfonts.c index c8567cf74..c85712bb5 100644 --- a/dix/dixfonts.c +++ b/dix/dixfonts.c @@ -1,5 +1,5 @@ /* $XdotOrg: xc/programs/Xserver/dix/dixfonts.c,v 1.1.4.3 2003/12/18 19:29:12 kaleb Exp $ */ -/* $XFree86: xc/programs/Xserver/dix/dixfonts.c,v 3.29 2003/11/17 22:20:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/dixfonts.c,v 3.28 2003/11/08 02:02:03 dawes Exp $ */ /************************************************************************ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. |