diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:27 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:27 +0000 |
| commit | 5514e12828075bf403243b48b8337de96970f7d7 (patch) | |
| tree | d2234ab25349fa94e6321a5db6c16d2f55dd7e9b | |
| parent | 83f8ee18a050cbad1a2d3770bc8c2ad0f89c3837 (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-- | xfsinfo.c | 2 | ||||
| -rw-r--r-- | xfsinfo.man | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -30,7 +30,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xfsinfo/xfsinfo.c,v 1.4 2001/12/14 20:01:42 dawes Exp $ */ +/* $XFree86: xc/programs/xfsinfo/xfsinfo.c,v 1.3 2001/08/27 17:41:02 dawes Exp $ */ /* * Copyright 1990 Network Computing Devices; diff --git a/xfsinfo.man b/xfsinfo.man index 3a6918d..7a4e030 100644 --- a/xfsinfo.man +++ b/xfsinfo.man @@ -24,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xfsinfo/xfsinfo.man,v 1.5 2001/12/14 20:01:42 dawes Exp $ +.\" $XFree86: xc/programs/xfsinfo/xfsinfo.man,v 1.4 2001/04/18 16:13:23 dawes Exp $ .\" .TH XFSINFO 1 __xorgversion__ .SH NAME |