diff options
author | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-03-17 20:25:47 +0000 |
---|---|---|
committer | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-03-17 20:25:47 +0000 |
commit | 942f06393a915ff354c57d3efae651dca2b3bc75 (patch) | |
tree | 2326842ad31be4a6899598b0bf221bc5aacc6356 /sxpm | |
parent | 8636e5cc7ce7ce5ac913e6a59e2a8e1ea9065b1e (diff) |
merge with XORG-RELEASE-1 (tag XORG-CYGWIN-LAST-MERGE)CYGWIN-RELEASE-1-MERGECYGWIN-PRE-6_8_0-MERGECYGWIN-HEAD-MERGECYGWIN-HEAD-LAST-MERGECYGWIN-6_8_0-MERGE
Diffstat (limited to 'sxpm')
-rw-r--r-- | sxpm/sxpm.c | 2 | ||||
-rw-r--r-- | sxpm/sxpm.man | 2 |
2 files changed, 2 insertions, 2 deletions
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 |