diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:39:28 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:39:28 +0000 |
| commit | 5ded9518470018c739dae3a3b24846ead0c35206 (patch) | |
| tree | e0df3f2b8e5a0d90e2ea906acde1b3928e98a726 /src/Glyph.c | |
| parent | 35a608915a0512ca419fb0d4f3116fd68d2d8bc5 (diff) | |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.XORG-CURRENT-premerge-release-1XACE-SELINUX-BASEDAMAGE-XFIXES-BASEDAMAGE-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 'src/Glyph.c')
| -rw-r--r-- | src/Glyph.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Glyph.c b/src/Glyph.c index 6495e53..4d5d4d4 100644 --- a/src/Glyph.c +++ b/src/Glyph.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/lib/Xrender/Glyph.c,v 1.12 2002/11/05 23:22:35 keithp Exp $ + * $XFree86: xc/lib/Xrender/Glyph.c,v 1.11 2002/10/18 01:13:39 keithp Exp $ * * Copyright © 2000 SuSE, Inc. * |