diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:04 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:04 +0000 |
| commit | 2c9ea4fcdd0390aedef76223320a81725149e27d (patch) | |
| tree | fa6a67031cfac03a0f71ae95e2449f29c216700c | |
| parent | c938dc59b46afdb0858a9c5cb4bf66c3825c6a36 (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-- | constype.c | 2 | ||||
| -rw-r--r-- | constype.man | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -17,7 +17,7 @@ * * Author: Doug Moran, SRI */ -/* $XFree86: xc/programs/Xserver/hw/sun/constype.c,v 3.9 2003/11/21 05:17:01 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/sun/constype.c,v 3.8 2003/10/07 21:40:07 herrb Exp $ */ /* SUN-SPOTS DIGEST Thursday, 17 March 1988 Volume 6 : Issue 31 diff --git a/constype.man b/constype.man index b09bc32..9d7f5e0 100644 --- a/constype.man +++ b/constype.man @@ -1,6 +1,6 @@ .\" $Xorg: constype.man,v 1.3 2000/08/17 19:48:29 cpqbld Exp $ .\" -.\" $XFree86: xc/programs/Xserver/hw/sun/constype.man,v 1.6 2001/01/27 18:20:41 dawes Exp $ +.\" $XFree86$ .\" .TH CONSTYPE 1 __xorgversion__ .SH NAME |