diff options
author | Egbert Eich <eich@suse.de> | 2004-03-04 17:47:14 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-03-04 17:47:14 +0000 |
commit | 62b3d837aeafb36ef49e981b63246f9756fbcea9 (patch) | |
tree | 312a4745841a1cfae98aade5bcc7f5ce54cc505f | |
parent | d809ef49c3ff28ef3b5b2f4a57c05ecff0ecc5c7 (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).
-rw-r--r-- | src/XDelAssoc.c | 2 | ||||
-rw-r--r-- | src/XDestAssoc.c | 2 | ||||
-rw-r--r-- | src/XDraw.c | 2 | ||||
-rw-r--r-- | src/XMakeAssoc.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/XDelAssoc.c b/src/XDelAssoc.c index 7ccf7f1..51db2e1 100644 --- a/src/XDelAssoc.c +++ b/src/XDelAssoc.c @@ -24,7 +24,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/lib/oldX/XDelAssoc.c,v 1.4 2001/12/14 19:57:02 dawes Exp $ */ +/* $XFree86: xc/lib/oldX/XDelAssoc.c,v 1.3 2001/01/17 19:43:37 dawes Exp $ */ #include "Xlibint.h" #include "X10.h" diff --git a/src/XDestAssoc.c b/src/XDestAssoc.c index ab89e06..d476805 100644 --- a/src/XDestAssoc.c +++ b/src/XDestAssoc.c @@ -24,7 +24,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/lib/oldX/XDestAssoc.c,v 1.4 2001/12/14 19:57:02 dawes Exp $ */ +/* $XFree86: xc/lib/oldX/XDestAssoc.c,v 1.3 2001/01/17 19:43:38 dawes Exp $ */ #include "Xlibint.h" #include "X10.h" diff --git a/src/XDraw.c b/src/XDraw.c index 03fde2a..4d6f694 100644 --- a/src/XDraw.c +++ b/src/XDraw.c @@ -26,7 +26,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/lib/oldX/XDraw.c,v 1.5 2001/12/14 19:57:02 dawes Exp $ */ +/* $XFree86: xc/lib/oldX/XDraw.c,v 1.4 2001/07/25 15:04:57 dawes Exp $ */ #include "Xlibint.h" #include "Xlib.h" diff --git a/src/XMakeAssoc.c b/src/XMakeAssoc.c index 734313d..162b3e0 100644 --- a/src/XMakeAssoc.c +++ b/src/XMakeAssoc.c @@ -24,7 +24,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/lib/oldX/XMakeAssoc.c,v 1.4 2001/12/14 19:57:03 dawes Exp $ */ +/* $XFree86: xc/lib/oldX/XMakeAssoc.c,v 1.3 2001/01/17 19:43:38 dawes Exp $ */ #include "Xlibint.h" #include "X10.h" |