diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:39:44 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:39:44 +0000 |
| commit | e7743f4b397fae6fdf62f9a5980bdc8e89955fbf (patch) | |
| tree | 7a793476296257883b264f68cb170e2675d7f4ed /Xtransutil.c | |
| parent | cd432af1694e321fd4cb65cd9b6aa877d59cf21d (diff) | |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.XORG-CURRENT-premerge-release-1XACE-SELINUX-BASEDAMAGE-XFIXES-BASE
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 'Xtransutil.c')
| -rw-r--r-- | Xtransutil.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Xtransutil.c b/Xtransutil.c index c3757ca..d84b1a8 100644 --- a/Xtransutil.c +++ b/Xtransutil.c @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/xtrans/Xtransutil.c,v 3.27 2003/07/18 15:53:24 tsi Exp $ */ +/* $XFree86: xc/lib/xtrans/Xtransutil.c,v 3.26 2003/07/09 15:27:30 tsi Exp $ */ /* Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA * |