From 6f939db2b40f27be48e000ddef0d851724f7991b Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 5 Mar 2004 13:40:29 +0000 Subject: 23. Merged with XFree86 4.4.0. Added changes that went into infected files. 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). --- src/riva_proto.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/riva_proto.h') diff --git a/src/riva_proto.h b/src/riva_proto.h index 75f5d01..bff07a2 100644 --- a/src/riva_proto.h +++ b/src/riva_proto.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_proto.h,v 1.1 2003/07/31 20:24:31 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_proto.h $ */ #ifndef __RIVA_PROTO_H__ #define __RIVA_PROTO_H__ -- cgit v1.2.3