diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:22 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:22 +0000 |
| commit | 06b6ff8f442ed1dc8f33cb21a098207fd7499b07 (patch) | |
| tree | 7a27af1b8ddc2ec8afa6c668ed387e8496e2e7a0 /util/mRegs.c | |
| parent | 1dec1a58dbac91deeddab0807c566d48154b7b57 (diff) | |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.XACE-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 'util/mRegs.c')
| -rw-r--r-- | util/mRegs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util/mRegs.c b/util/mRegs.c index 4d8da11..b1688de 100644 --- a/util/mRegs.c +++ b/util/mRegs.c @@ -4,7 +4,7 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/util/mRegs.c,v 1.6 2001/11/16 21:13:34 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/util/mRegs.c,v 1.5 2000/10/23 12:10:13 alanh Exp $ */ #ifdef __NetBSD__ # include <sys/types.h> |