[xorg-commit-diffs] xc/lib/Xft Xft.3.in, 1.1.2.1, 1.1.2.2 Xft.man, 1.1.4.1.6.4, 1.1.4.1.6.5

[Egbert Eich]

Committed by: eich

Update of /cvs/xorg/xc/lib/Xft
In directory pdx:/tmp/cvs-serv13014/lib/Xft

Modified Files:
      Tag: XORG-RELEASE-1
	Xft.3.in Xft.man 
Log Message:
 70. Merging in the TM branch (Egbert Eich).



Index: Xft.3.in
===================================================================
RCS file: /cvs/xorg/xc/lib/Xft/Attic/Xft.3.in,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- a/Xft.3.in	11 Mar 2004 14:16:10 -0000	1.1.2.1
+++ b/Xft.3.in	2 Apr 2004 21:47:12 -0000	1.1.2.2
@@ -1,5 +1,5 @@
 .\"
-.\" $Id: Xft.3.in,v 1.2 2003/04/25 16:11:35 keithp Exp $
+.\" $Id: Xft.3.in,v 1.1.2.1 2004/03/11 14:16:10 eich Exp $
 .\"
 .\" Copyright © 2000 Keith Packard
 .\"
@@ -138,4 +138,4 @@
 compatibility in future releases.
 
 .SH AUTHOR
-Keith Packard, member of the XFree86 Project, Inc.
+Keith Packard

Index: Xft.man
===================================================================
RCS file: /cvs/xorg/xc/lib/Xft/Xft.man,v
retrieving revision 1.1.4.1.6.4
retrieving revision 1.1.4.1.6.5
diff -u -d -r1.1.4.1.6.4 -r1.1.4.1.6.5
--- a/Xft.man	12 Mar 2004 11:18:23 -0000	1.1.4.1.6.4
+++ b/Xft.man	2 Apr 2004 21:47:12 -0000	1.1.4.1.6.5
@@ -1,5 +1,5 @@
 .\"
-.\" $Id: Xft.man,v 1.1.4.1.6.3 2004/03/11 14:16:10 eich Exp $
+.\" $Id: Xft.man,v 1.1.4.1.6.4 2004/03/12 11:18:23 eich Exp $
 .\"
 .\" Copyright © 2000 Keith Packard
 .\"
@@ -26,7 +26,7 @@
 .ns
 .TP \\$1
 ..
-.TH XFT 3 "Version 2.1.5" "Xft"
+.TH XFT __libmansuffix__ __vendorversion__
 
 .SH NAME
  Xft \- X FreeType interface library
@@ -138,4 +138,4 @@
 compatibility in future releases.
 
 .SH AUTHOR
-Keith Packard, member of the XFree86 Project, Inc.
+Keith Packard