diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:39:30 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:39:30 +0000 |
| commit | e1776973e1fbb3d6a0b043a3b34ff56c61416a7f (patch) | |
| tree | c501bcce6e36b6d99cc6e190e446c076efe85f02 /util | |
| parent | 2928a163b235d91385874aa6a1a6f893b045f606 (diff) | |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.XACE-SELINUX-BASEDAMAGE-XFIXES-BASEDAMAGE-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).
Diffstat (limited to 'util')
| -rw-r--r-- | util/Shell.ht | 2 | ||||
| -rw-r--r-- | util/StrDefs.ct | 2 | ||||
| -rw-r--r-- | util/StrDefs.ht | 2 | ||||
| -rw-r--r-- | util/makestrs.c | 2 | ||||
| -rw-r--r-- | util/makestrs.man | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/util/Shell.ht b/util/Shell.ht index c511645..c9e7e01 100644 --- a/util/Shell.ht +++ b/util/Shell.ht @@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/util/Shell.ht,v 3.5 2001/12/14 19:56:39 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/util/Shell.ht,v 3.4 2001/07/29 05:01:12 tsi Exp $ */ #ifndef _XtShell_h #define _XtShell_h diff --git a/util/StrDefs.ct b/util/StrDefs.ct index 0c60d80..ea971f1 100644 --- a/util/StrDefs.ct +++ b/util/StrDefs.ct @@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/util/StrDefs.ct,v 3.5 2001/12/14 19:56:39 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/util/StrDefs.ct,v 3.4 2001/07/29 05:01:12 tsi Exp $ */ #define Const const diff --git a/util/StrDefs.ht b/util/StrDefs.ht index c3f70b3..c23759c 100644 --- a/util/StrDefs.ht +++ b/util/StrDefs.ht @@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/util/StrDefs.ht,v 3.5 2001/12/14 19:56:39 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/util/StrDefs.ht,v 3.4 2001/07/29 05:01:12 tsi Exp $ */ #ifndef _XtStringDefs_h_ #define _XtStringDefs_h_ diff --git a/util/makestrs.c b/util/makestrs.c index 803bad7..f544146 100644 --- a/util/makestrs.c +++ b/util/makestrs.c @@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/config/util/makestrs.c,v 3.7 2001/12/14 19:53:22 dawes Exp $ */ +/* $XFree86: xc/config/util/makestrs.c,v 3.6 2001/07/25 15:04:41 dawes Exp $ */ /* Constructs string definitions */ diff --git a/util/makestrs.man b/util/makestrs.man index a946bc7..4fe23e8 100644 --- a/util/makestrs.man +++ b/util/makestrs.man @@ -23,7 +23,7 @@ .\" dealing in this Software without prior written authorization from The .\" Open Group. .\" -.\" $XFree86: xc/config/util/makestrs.man,v 3.9 2003/05/29 21:48:03 herrb Exp $ +.\" $XFree86: xc/config/util/makestrs.man,v 3.8 2001/12/14 19:53:22 dawes Exp $ .\" .TH MAKESTRS 1 __xorgversion__ .SH NAME |