diff options
author | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:17 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:17 +0000 |
commit | b89b5ee528b1d57bcf2415ef816383c9e0d62b85 (patch) | |
tree | b8e352ae3787544f64a525373b2c23869b76518d | |
parent | b05cae7ab6f88fbd3c5fd0dfeca2ab170e477e65 (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-- | save.c | 2 | ||||
-rw-r--r-- | smproxy.c | 2 | ||||
-rw-r--r-- | smproxy.h | 2 | ||||
-rw-r--r-- | smproxy.man | 2 |
4 files changed, 4 insertions, 4 deletions
@@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group. Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86: xc/programs/smproxy/save.c,v 1.8 2001/12/14 20:01:05 dawes Exp $ */ +/* $XFree86: xc/programs/smproxy/save.c,v 1.7 2001/01/17 23:45:04 dawes Exp $ */ #include "smproxy.h" #ifdef HAS_MKSTEMP @@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group. Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86: xc/programs/smproxy/smproxy.c,v 3.9 2001/12/14 20:01:05 dawes Exp $ */ +/* $XFree86: xc/programs/smproxy/smproxy.c,v 3.8 2001/10/28 03:34:25 tsi Exp $ */ #include "smproxy.h" #include <unistd.h> @@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group. Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86: xc/programs/smproxy/smproxy.h,v 1.6 2001/12/14 20:01:05 dawes Exp $ */ +/* $XFree86: xc/programs/smproxy/smproxy.h,v 1.5 2001/07/25 15:05:16 dawes Exp $ */ #include <X11/Xosdefs.h> #include <X11/Xfuncs.h> diff --git a/smproxy.man b/smproxy.man index d18650d..543c6cf 100644 --- a/smproxy.man +++ b/smproxy.man @@ -23,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/smproxy/smproxy.man,v 1.7 2001/12/14 20:01:05 dawes Exp $ +.\" $XFree86: xc/programs/smproxy/smproxy.man,v 1.6 2001/01/27 18:21:06 dawes Exp $ .\" .TH XSM 1 __xorgversion__ .SH NAME |