diff options
author | Egbert Eich <eich@suse.de> | 2004-03-04 17:46:35 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-03-04 17:46:35 +0000 |
commit | 3c8bd6bda1182683e3bf6f795cdbbd4738ce6b0c (patch) | |
tree | b5a4d78af2b89be081b45cbe37ea618e4e32e483 /include/X11 | |
parent | 886d7dc02b0d14074df048196829573a66d91819 (diff) |
18. Merged in XFree86 code up to 4.4.0 including changes to files that hadxo-6_7_0XPRINT_BEGINXPRINT_BASEXORG-TM-CYGWIN-MERGEXORG-TM-CYGWIN-LAST-MERGEXORG-RELEASE-1-TM-MERGEXORG-RELEASE-1-TM-CLOSEDXORG-RELEASE-1-TM-BASEXORG-RELEASE-1-STSF-FORKXORG-RELEASE-1-MERGEXORG-CYGWIN-MERGEXORG-CYGWIN-LAST-MERGEXORG-6_7_0IPv6-REVIEW-BASEXPRINTXORG-RELEASE-1-TMXORG-RELEASE-1-STSFXORG-RELEASE-1IPv6-REVIEW
a changed license. There was only one change which happened to be from
me (Egbert Eich).
Diffstat (limited to 'include/X11')
-rw-r--r-- | include/X11/ICE/ICElib.h | 2 | ||||
-rw-r--r-- | include/X11/ICE/ICEmsg.h | 2 | ||||
-rw-r--r-- | include/X11/ICE/ICEutil.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/X11/ICE/ICElib.h b/include/X11/ICE/ICElib.h index 34b05eb..200cd19 100644 --- a/include/X11/ICE/ICElib.h +++ b/include/X11/ICE/ICElib.h @@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group. Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86: xc/lib/ICE/ICElib.h,v 3.5 2003/11/17 22:20:05 dawes Exp $ */ +/* $XFree86: xc/lib/ICE/ICElib.h,v 3.4 2001/12/14 19:53:35 dawes Exp $ */ #ifndef _ICELIB_H_ #define _ICELIB_H_ diff --git a/include/X11/ICE/ICEmsg.h b/include/X11/ICE/ICEmsg.h index 2146a6d..ddae027 100644 --- a/include/X11/ICE/ICEmsg.h +++ b/include/X11/ICE/ICEmsg.h @@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group. Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86: xc/lib/ICE/ICEmsg.h,v 1.5 2003/11/17 22:20:05 dawes Exp $ */ +/* $XFree86: xc/lib/ICE/ICEmsg.h,v 1.4 2001/12/20 19:40:59 tsi Exp $ */ #ifndef _ICEMSG_H_ #define _ICEMSG_H_ diff --git a/include/X11/ICE/ICEutil.h b/include/X11/ICE/ICEutil.h index e63a649..5e1d2af 100644 --- a/include/X11/ICE/ICEutil.h +++ b/include/X11/ICE/ICEutil.h @@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group. Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86: xc/lib/ICE/ICEutil.h,v 1.5 2003/11/17 22:20:05 dawes Exp $ */ +/* $XFree86: xc/lib/ICE/ICEutil.h,v 1.4 2001/12/20 19:40:59 tsi Exp $ */ #ifndef _ICEUTIL_H_ #define _ICEUTIL_H_ |