diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:39 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:39 +0000 |
| commit | 5b2a88d549da43cf07f5ffec7f5386af56905b50 (patch) | |
| tree | 490bfba2f7ac3dd1d17db693c1f6b98e1371ed08 | |
| parent | 7872e2ca97eb68973cddf7abe12e98df7cea9e4d (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-- | xstdcmap.c | 2 | ||||
| -rw-r--r-- | xstdcmap.man | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group. * * * Author: Donna Converse, MIT X Consortium */ -/* $XFree86: xc/programs/xstdcmap/xstdcmap.c,v 1.9 2003/03/26 20:44:00 tsi Exp $ */ +/* $XFree86: xc/programs/xstdcmap/xstdcmap.c,v 1.8tsi Exp $ */ #include <stdio.h> #include <stdlib.h> diff --git a/xstdcmap.man b/xstdcmap.man index 09c045c..0ce2b9f 100644 --- a/xstdcmap.man +++ b/xstdcmap.man @@ -23,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xstdcmap/xstdcmap.man,v 1.8 2001/12/14 20:02:30 dawes Exp $ +.\" $XFree86: xc/programs/xstdcmap/xstdcmap.man,v 1.7 2001/01/27 18:21:24 dawes Exp $ .\" .de EX \"Begin example .ne 5 |