summaryrefslogtreecommitdiff
path: root/src/Tri.c
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-05 13:39:28 +0000
committerEgbert Eich <eich@suse.de>2004-03-05 13:39:28 +0000
commit5ded9518470018c739dae3a3b24846ead0c35206 (patch)
treee0df3f2b8e5a0d90e2ea906acde1b3928e98a726 /src/Tri.c
parent35a608915a0512ca419fb0d4f3116fd68d2d8bc5 (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/Tri.c')
-rw-r--r--src/Tri.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Tri.c b/src/Tri.c
index ead95a3..44e87e0 100644
--- a/src/Tri.c
+++ b/src/Tri.c
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/lib/Xrender/Tri.c,v 1.3 2002/11/05 23:22:35 keithp Exp $
+ * $XFree86: xc/lib/Xrender/Tri.c,v 1.2 2002/05/15 06:43:22 keithp Exp $
*
* Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
*