Module Name:	xsrc
Committed By:	veego
Date:		Sun Mar 18 19:36:54 UTC 2001

Modified Files:
	xsrc/xfree/xc/lib/font/Type1: arith.c curves.c hints.c objects.c
	    objects.h paths.c regions.c spaces.c t1funcs.c t1malloc.c t1stub.c

Log Message:
Resolve conflicts of the import of XFree86 4.0.3.


To generate a diff of this commit:
cvs rdiff -r1.2 -r1.3 xsrc/xfree/xc/lib/font/Type1/arith.c \
    xsrc/xfree/xc/lib/font/Type1/curves.c \
    xsrc/xfree/xc/lib/font/Type1/hints.c \
    xsrc/xfree/xc/lib/font/Type1/objects.c \
    xsrc/xfree/xc/lib/font/Type1/objects.h \
    xsrc/xfree/xc/lib/font/Type1/paths.c \
    xsrc/xfree/xc/lib/font/Type1/regions.c \
    xsrc/xfree/xc/lib/font/Type1/spaces.c \
    xsrc/xfree/xc/lib/font/Type1/t1funcs.c \
    xsrc/xfree/xc/lib/font/Type1/t1malloc.c \
    xsrc/xfree/xc/lib/font/Type1/t1stub.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.