diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:23 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:23 +0000 |
| commit | e448179e3044d0e7dfdab2412039bfa1cdaa8a1c (patch) | |
| tree | 58ded1429851776c1777721989588bf60ef708c1 /grid.h | |
| parent | 6200a59d08830ff6344825317cf72d67e4aee78c (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 'grid.h')
| -rw-r--r-- | grid.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xfd/grid.h,v 1.5 2003/11/17 22:20:53 dawes Exp $ */ +/* $XFree86: xc/programs/xfd/grid.h,v 1.4 2002/07/23 01:45:41 tsi Exp $ */ #ifndef _FontGrid_h_ #define _FontGrid_h_ |