diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:29 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:29 +0000 |
| commit | 6f939db2b40f27be48e000ddef0d851724f7991b (patch) | |
| tree | 43afd0a2261c274470ef49c4379927d16e2bd5d7 /src/nv_include.h | |
| parent | a13885d1155c944863c8c17f054105edde568330 (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/nv_include.h')
| -rw-r--r-- | src/nv_include.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nv_include.h b/src/nv_include.h index 2d4465b..acd3543 100644 --- a/src/nv_include.h +++ b/src/nv_include.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_include.h,v 1.11 2001/12/07 00:09:56 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_include.h,v 1.9 2000/10/06 12:31:03 eich Exp $ */ #ifndef __NV_INCLUDE_H__ #define __NV_INCLUDE_H__ |