[xorg-commit-diffs] xc/lib/font/X-TrueType cconvversion.h, 1.1.4.1, 1.1.4.2

[Egbert Eich]

Committed by: eich

Update of /cvs/xorg/xc/lib/font/X-TrueType
In directory pdx:/home/eich/tstbuild/xc/lib/font/X-TrueType

Modified Files:
      Tag: XORG-CURRENT
	cconvversion.h 
Log Message:
2004-04-15  Egbert Eich  <eich at freedesktop.org>
        Merged changes from RELEASE-1 branch
	


Index: cconvversion.h
===================================================================
RCS file: /cvs/xorg/xc/lib/font/X-TrueType/cconvversion.h,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/cconvversion.h	5 Mar 2004 13:39:33 -0000	1.1.4.1
+++ b/cconvversion.h	15 Apr 2004 10:15:10 -0000	1.1.4.2
@@ -26,7 +26,7 @@
 	_XTT_VENDOR_NAME, \
 	MODINFOSTRING1, \
 	MODINFOSTRING2, \
-	XF86_VERSION_CURRENT, \
+	XORG_VERSION_CURRENT, \
 	_XTT_V_MAJOR, \
 	_XTT_V_MINOR, \
 	_XTT_V_REVISION, \