diff options
author | Egbert Eich <eich@suse.de> | 2004-04-23 19:54:37 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-04-23 19:54:37 +0000 |
commit | bccb9870db6a9390df2ecc2f0148c50e96c56247 (patch) | |
tree | 87adb3a233e85764d67e8cd5c09857609db63c10 | |
parent | 3feadf8e6a5896ea73318a2031603deb62e732c8 (diff) |
Merging XORG-CURRENT into trunksco_port_update-baserel-0-6-1lg3d-rel-0-7-0lg3d-rel-0-6-2lg3d-baseXORG-6_8_99_903XORG-6_8_99_902XORG-6_8_99_901XORG-6_8_99_900XORG-6_8_99_9XORG-6_8_99_8XORG-6_8_99_7XORG-6_8_99_6XORG-6_8_99_5XORG-6_8_99_4XORG-6_8_99_3XORG-6_8_99_2XORG-6_8_99_16XORG-6_8_99_15XORG-6_8_99_14XORG-6_8_99_13XORG-6_8_99_12XORG-6_8_99_11XORG-6_8_99_10XORG-6_8_99_1XORG-6_8_2XORG-6_8_1_904XORG-6_8_1_903XORG-6_8_1_902XORG-6_8_1_901XORG-6_8_1XORG-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-MERGEXORG-6_8-branch
-rw-r--r-- | showfont.c | 2 | ||||
-rw-r--r-- | showfont.man | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -49,7 +49,7 @@ other dealings in this Software without prior written authorization from the X Consortium. */ -/* $XFree86: xc/programs/showfont/showfont.c,v 1.4 2001/08/27 17:41:01 dawes Exp $ */ +/* $XFree86: xc/programs/showfont/showfont.c,v 1.3 2000/02/18 12:20:17 tsi Exp $ */ #include <stdio.h> #include <stdlib.h> diff --git a/showfont.man b/showfont.man index 43b52a8..93b052b 100644 --- a/showfont.man +++ b/showfont.man @@ -1,5 +1,5 @@ .\" $XConsortium: showfont.man,v 1.3 94/04/11 14:29:57 gildea Exp $ -.\" $XFree86: xc/programs/showfont/showfont.man,v 1.4 2001/01/27 18:21:06 dawes Exp $ +.\" $XFree86: xc/programs/showfont/showfont.man,v 1.3 2000/02/17 14:00:33 dawes Exp $ .TH SHOWFONT 1 __xorgversion__ .SH NAME showfont \- font dumper for X font server |