diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:38:52 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:38:52 +0000 |
| commit | 44198c696bcc3e5b6376a6e29b674d05a3713976 (patch) | |
| tree | e1a068bed9f20fa9473505b4d27d316b28206889 /xf86dga1str.h | |
| parent | 5a8a30dff40081bde773509b17e687d5387345f4 (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-CURRENTXACE-SELINUXDAMAGE-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 'xf86dga1str.h')
| -rw-r--r-- | xf86dga1str.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xf86dga1str.h b/xf86dga1str.h index 5695fbd..0dfde9b 100644 --- a/xf86dga1str.h +++ b/xf86dga1str.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/xf86dga1str.h,v 1.2 1999/05/03 12:15:37 dawes Exp $ */ +/* $XFree86: xc/include/extensions/xf86dga1str.h,v 1.1 1999/03/28 15:31:33 dawes Exp $ */ /* Copyright (c) 1995 Jon Tombs |