diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-23 18:42:32 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-23 18:42:32 +0000 |
| commit | 2773a7214e282f6f673483f5233b880505947c3f (patch) | |
| tree | 2326842ad31be4a6899598b0bf221bc5aacc6356 /sxpm | |
| parent | 65c64a2eaa8698434f1869dcdcb5d9ccb21c6932 (diff) | |
| download | xorg-lib-libXpm-2773a7214e282f6f673483f5233b880505947c3f.tar.gz | |
Merging XORG-CURRENT into trunkrel-0-6-1lg3d-rel-0-7-0lg3d-baseXORG-6_8_0XORG-6_7_99_904XORG-6_7_99_903XORG-6_7_99_902XORG-6_7_99_901XORG-6_7_99_2XORG-6_7_99_1XACE-SELINUX-MERGElg3d-eventlg3d-dev-0-6-latestlg3d-dev-0-6-1-latestlg3d-dev-0-6-1-currentlg3dCOMPOSITEWRAP
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 |