diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-04 17:46:10 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-04 17:46:10 +0000 |
| commit | 01e908f07de620b63ddd531634573cca0e5ff447 (patch) | |
| tree | 2326842ad31be4a6899598b0bf221bc5aacc6356 | |
| parent | 8636e5cc7ce7ce5ac913e6a59e2a8e1ea9065b1e (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-- | cxpm/cxpm.c | 2 | ||||
| -rw-r--r-- | include/X11/xpm.h | 2 | ||||
| -rw-r--r-- | src/CrBufFrI.c | 2 | ||||
| -rw-r--r-- | src/CrDatFrI.c | 2 | ||||
| -rw-r--r-- | src/RdFToI.c | 2 | ||||
| -rw-r--r-- | src/WrFFrI.c | 2 | ||||
| -rw-r--r-- | src/XpmI.h | 2 | ||||
| -rw-r--r-- | src/create.c | 2 | ||||
| -rw-r--r-- | src/data.c | 2 | ||||
| -rw-r--r-- | src/parse.c | 4 | ||||
| -rw-r--r-- | src/scan.c | 2 | ||||
| -rw-r--r-- | sxpm/sxpm.c | 2 | ||||
| -rw-r--r-- | sxpm/sxpm.man | 2 |
13 files changed, 14 insertions, 14 deletions
diff --git a/cxpm/cxpm.c b/cxpm/cxpm.c index f7a7c5e..7c2001f 100644 --- a/cxpm/cxpm.c +++ b/cxpm/cxpm.c @@ -22,7 +22,7 @@ * used in advertising or otherwise to promote the sale, use or other dealings * in this Software without prior written authorization from Arnaud LE HORS. */ -/* $XFree86: xc/extras/Xpm/cxpm/cxpm.c,v 1.3 2003/05/27 16:45:41 tsi Exp $ */ +/* $XFree86: xc/extras/Xpm/cxpm/cxpm.c,v 1.2 2001/08/01 00:44:34 tsi Exp $ */ /*****************************************************************************\ * cxpm.c: * diff --git a/include/X11/xpm.h b/include/X11/xpm.h index 8895323..1cbc3a3 100644 --- a/include/X11/xpm.h +++ b/include/X11/xpm.h @@ -22,7 +22,7 @@ * used in advertising or otherwise to promote the sale, use or other dealings * in this Software without prior written authorization from GROUPE BULL. */ -/* $XFree86: xc/extras/Xpm/lib/xpm.h,v 1.3 2003/11/17 22:20:02 dawes Exp $ */ +/* $XFree86: xc/extras/Xpm/lib/xpm.h,v 1.2 2001/08/22 23:36:44 dawes Exp $ */ /*****************************************************************************\ * xpm.h: * diff --git a/src/CrBufFrI.c b/src/CrBufFrI.c index da6735f..9d8545f 100644 --- a/src/CrBufFrI.c +++ b/src/CrBufFrI.c @@ -31,7 +31,7 @@ * * * Developed by Arnaud Le Hors * \*****************************************************************************/ -/* $XFree86: xc/extras/Xpm/lib/CrBufFrI.c,v 1.2 2001/10/28 03:32:09 tsi Exp $ */ +/* $XFree86$ */ #include "XpmI.h" diff --git a/src/CrDatFrI.c b/src/CrDatFrI.c index 71fac8b..55f8b06 100644 --- a/src/CrDatFrI.c +++ b/src/CrDatFrI.c @@ -31,7 +31,7 @@ * * * Developed by Arnaud Le Hors * \*****************************************************************************/ -/* $XFree86: xc/extras/Xpm/lib/CrDatFrI.c,v 1.2 2001/10/28 03:32:09 tsi Exp $ */ +/* $XFree86$ */ #include "XpmI.h" diff --git a/src/RdFToI.c b/src/RdFToI.c index 867d656..d1242c4 100644 --- a/src/RdFToI.c +++ b/src/RdFToI.c @@ -31,7 +31,7 @@ * * * Developed by Arnaud Le Hors * \*****************************************************************************/ -/* $XFree86: xc/extras/Xpm/lib/RdFToI.c,v 1.2 2001/10/28 03:32:09 tsi Exp $ */ +/* $XFree86$ */ #include "XpmI.h" #include <sys/stat.h> diff --git a/src/WrFFrI.c b/src/WrFFrI.c index 0769f80..41b4c0d 100644 --- a/src/WrFFrI.c +++ b/src/WrFFrI.c @@ -31,7 +31,7 @@ * * * Developed by Arnaud Le Hors * \*****************************************************************************/ -/* $XFree86: xc/extras/Xpm/lib/WrFFrI.c,v 1.2 2001/10/28 03:32:09 tsi Exp $ */ +/* $XFree86$ */ /* * The code related to AMIGA has been added by @@ -22,7 +22,7 @@ * used in advertising or otherwise to promote the sale, use or other dealings * in this Software without prior written authorization from GROUPE BULL. */ -/* $XFree86: xc/extras/Xpm/lib/XpmI.h,v 1.9 2003/08/06 14:03:58 eich Exp $ */ +/* $XFree86: xc/extras/Xpm/lib/XpmI.h,v 1.7 2001/11/01 23:35:25 dawes Exp $ */ /*****************************************************************************\ * XpmI.h: * diff --git a/src/create.c b/src/create.c index 2fba038..790e23e 100644 --- a/src/create.c +++ b/src/create.c @@ -32,7 +32,7 @@ * * * Developed by Arnaud Le Hors * \*****************************************************************************/ -/* $XFree86: xc/extras/Xpm/lib/create.c,v 1.5 2003/10/07 21:25:37 herrb Exp $ */ +/* $XFree86: xc/extras/Xpm/lib/create.c,v 1.4 2003/05/27 22:26:20 tsi Exp $ */ /* * The code related to FOR_MSW has been added by @@ -31,7 +31,7 @@ * * * Developed by Arnaud Le Hors * \*****************************************************************************/ -/* $XFree86: xc/extras/Xpm/lib/data.c,v 1.4 2002/01/07 19:40:49 dawes Exp $ */ +/* $XFree86: xc/extras/Xpm/lib/data.c,v 1.3 2001/10/28 03:32:10 tsi Exp $ */ #ifndef CXPMPROG #if 0 diff --git a/src/parse.c b/src/parse.c index fc8cd2b..3c819a2 100644 --- a/src/parse.c +++ b/src/parse.c @@ -22,7 +22,7 @@ * used in advertising or otherwise to promote the sale, use or other dealings * in this Software without prior written authorization from GROUPE BULL. */ -/* $XFree86: xc/extras/Xpm/lib/parse.c,v 1.3 2001/10/28 03:32:10 tsi Exp $ */ +/* $XFree86: xc/extras/Xpm/lib/parse.c,v 1.2 2000/09/26 15:56:43 tsi Exp $ */ /*****************************************************************************\ * parse.c: * @@ -33,7 +33,7 @@ * * * Developed by Arnaud Le Hors * \*****************************************************************************/ -/* $XFree86: xc/extras/Xpm/lib/parse.c,v 1.3 2001/10/28 03:32:10 tsi Exp $ */ +/* $XFree86$ */ /* * The code related to FOR_MSW has been added by @@ -31,7 +31,7 @@ * * * Developed by Arnaud Le Hors * \*****************************************************************************/ -/* $XFree86: xc/extras/Xpm/lib/scan.c,v 1.3 2002/01/07 19:40:49 dawes Exp $ */ +/* $XFree86: xc/extras/Xpm/lib/scan.c,v 1.2 2001/10/28 03:32:11 tsi Exp $ */ /* * The code related to FOR_MSW has been added by diff --git a/sxpm/sxpm.c b/sxpm/sxpm.c index b98ea9f..9d0b42e 100644 --- a/sxpm/sxpm.c +++ b/sxpm/sxpm.c @@ -22,7 +22,7 @@ * used in advertising or otherwise to promote the sale, use or other dealings * in this Software without prior written authorization from GROUPE BULL. */ -/* $XFree86: xc/extras/Xpm/sxpm/sxpm.c,v 1.3 2001/10/28 03:32:13 tsi Exp $ */ +/* $XFree86: xc/extras/Xpm/sxpm/sxpm.c,v 1.2 2001/08/01 00:44:34 tsi Exp $ */ /*****************************************************************************\ * sxpm.c: * diff --git a/sxpm/sxpm.man b/sxpm/sxpm.man index 806ba1d..9d727fa 100644 --- a/sxpm/sxpm.man +++ b/sxpm/sxpm.man @@ -21,7 +21,7 @@ .\"used in advertising or otherwise to promote the sale, use or other dealings .\"in this Software without prior written authorization from GROUPE BULL. .\" -.\" $XFree86: xc/extras/Xpm/sxpm/sxpm.man,v 1.3 2003/10/22 20:39:36 tsi Exp $ +.\" $XFree86$ .nr )S 12 .TH SXPM 1 .PD |