diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:25 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:25 +0000 |
| commit | b898bcbd0a540b64d73c9fd4db2069ed6a00360f (patch) | |
| tree | bfc99c3d4bdcc4ef6bb59fcca5294ef1f49e1fec /src/mga_macros.h | |
| parent | 03f00bf8411e6c36d3aef1907e42a52854353101 (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/mga_macros.h')
| -rw-r--r-- | src/mga_macros.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mga_macros.h b/src/mga_macros.h index d985081..9515879 100644 --- a/src/mga_macros.h +++ b/src/mga_macros.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_macros.h,v 1.22 2002/02/20 17:17:50 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_macros.h,v 1.21 2001/09/26 12:59:17 alanh Exp $ */ #ifndef _MGA_MACROS_H_ #define _MGA_MACROS_H_ |