From e1776973e1fbb3d6a0b043a3b34ff56c61416a7f Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 5 Mar 2004 13:39:30 +0000 Subject: 23. Merged with XFree86 4.4.0. Added changes that went into infected files. 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). --- include/X11/Xtos.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/X11/Xtos.h') diff --git a/include/X11/Xtos.h b/include/X11/Xtos.h index f87fdb2..efb08cf 100644 --- a/include/X11/Xtos.h +++ b/include/X11/Xtos.h @@ -48,7 +48,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/Xtos.h,v 3.13 2003/10/24 15:47:35 tsi Exp $ */ +/* $XFree86: xc/lib/Xt/Xtos.h,v 3.12tsi Exp $ */ #ifndef _Xtos_h #define _Xtos_h -- cgit v1.2.3