diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:19 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:19 +0000 |
| commit | 397653e558b5fa4936ee6c9ac1eb6acaa9cf1cbc (patch) | |
| tree | 5988c3f829963dfa7315e626c4d0e72e85d76e09 /src/aticonsole.h | |
| parent | 42cbea1d05a9e44b0d560da29bff19711ebb8a94 (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/aticonsole.h')
| -rw-r--r-- | src/aticonsole.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/aticonsole.h b/src/aticonsole.h index 6b4b803..da71c65 100644 --- a/src/aticonsole.h +++ b/src/aticonsole.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/aticonsole.h,v 1.10 2004/01/05 16:42:01 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/aticonsole.h,v 1.9 2003/01/01 19:16:31 tsi Exp $ */ /* * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * |