diff options
author | Egbert Eich <eich@suse.de> | 2004-03-04 17:47:49 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-03-04 17:47:49 +0000 |
commit | 76499605ae964f17633b8f7c36edb6562ca7d7ff (patch) | |
tree | 43afd0a2261c274470ef49c4379927d16e2bd5d7 /src/nv_proto.h | |
parent | a13885d1155c944863c8c17f054105edde568330 (diff) |
18. Merged in XFree86 code up to 4.4.0 including changes to files that hadXPRINT_BASEXORG-RELEASE-1-TM-MERGEXORG-RELEASE-1-TM-BASEIPv6-REVIEW-BASEIPv6-REVIEW
a changed license. There was only one change which happened to be from
me (Egbert Eich).
Diffstat (limited to 'src/nv_proto.h')
-rw-r--r-- | src/nv_proto.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nv_proto.h b/src/nv_proto.h index f526a71..a074346 100644 --- a/src/nv_proto.h +++ b/src/nv_proto.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_proto.h,v 1.10 2003/07/31 20:24:29 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_proto.h,v 1.9 2003/05/04 01:20:52 mvojkovi Exp $ */ #ifndef __NV_PROTO_H__ #define __NV_PROTO_H__ |