From 9231a3312bb099559fb6902f8641a4f331fc4ce5 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 5 Mar 2004 13:41:18 +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). --- do_complex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'do_complex.c') diff --git a/do_complex.c b/do_complex.c index faa073f..1886da9 100644 --- a/do_complex.c +++ b/do_complex.c @@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************************/ -/* $XFree86: xc/programs/x11perf/do_complex.c,v 1.9 2002/05/31 18:46:09 dawes Exp $ */ +/* $XFree86: xc/programs/x11perf/do_complex.c,v 1.8 2001/07/25 15:05:16 dawes Exp $ */ #include "x11perf.h" -- cgit v1.2.3