diff options
author | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:23 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:23 +0000 |
commit | c59cf10ee5393848b500d86d831084019638797c (patch) | |
tree | 3cf5b5095f2b7069655fcebe8454578261ade5a8 | |
parent | c59961240eb13fe721832a04de999d5752432454 (diff) |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.before_20040421_xprint_branch_landingXORG-CURRENT-premerge-release-1XORG-CURRENT-CLOSEDXACE-SELINUX-BASEDAMAGE-XFIXES-BASEXORG-CURRENTXACE-SELINUXDAMAGE-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).
-rw-r--r-- | dga.c | 2 | ||||
-rw-r--r-- | dga.man | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -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 <X11/Xos.h> #include <X11/Intrinsic.h> @@ -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 |