From c59cf10ee5393848b500d86d831084019638797c Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 5 Mar 2004 13:41:23 +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). --- dga.c | 2 +- dga.man | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dga.c b/dga.c index 35ab604..e2a7ce4 100644 --- a/dga.c +++ b/dga.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/xf86dga/dga.c,v 3.20 2002/05/31 18:46:11 dawes Exp $ */ +/* $XFree86: xc/programs/xf86dga/dga.c,v 3.19 2001/10/28 03:34:32 tsi Exp $ */ #include #include diff --git a/dga.man b/dga.man index 66d0df5..c7d9fc1 100644 --- a/dga.man +++ b/dga.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/xf86dga/dga.man,v 3.5 2001/01/27 18:21:12 dawes Exp $ +.\" $XFree86: xc/programs/xf86dga/dga.man,v 3.4 1997/11/08 16:24:37 hohndel Exp $ .\" .TH dga 1 __vendorversion__ .SH NAME -- cgit v1.2.3