diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:36 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:36 +0000 |
| commit | ab657db322d1a53518fe0d295fcd8db43384eca4 (patch) | |
| tree | e65730e317817dd677a3214d83cac76f3e99e6e8 | |
| parent | e02bcc43b489ca021248d8ea001d7adb2545d5fe (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-- | xlsclients.c | 2 | ||||
| -rw-r--r-- | xlsclients.man | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/xlsclients.c b/xlsclients.c index 447af85..3effbf4 100644 --- a/xlsclients.c +++ b/xlsclients.c @@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group. * * * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/programs/xlsclients/xlsclients.c,v 1.6 2001/12/14 20:02:09 dawes Exp $ */ +/* $XFree86: xc/programs/xlsclients/xlsclients.c,v 1.5 2001/04/01 14:00:23 tsi Exp $ */ #include <stdio.h> #include <stdlib.h> diff --git a/xlsclients.man b/xlsclients.man index 4d977e6..13e93a1 100644 --- a/xlsclients.man +++ b/xlsclients.man @@ -23,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xlsclients/xlscli.man,v 1.8 2001/12/14 20:02:08 dawes Exp $ +.\" $XFree86: xc/programs/xlsclients/xlscli.man,v 1.7 2001/01/27 18:21:18 dawes Exp $ .\" .TH XLSCLIENTS 1 __xorgversion__ .SH NAME |