Module Name:	xsrc
Committed By:	tron
Date:		Fri Mar 18 16:43:43 UTC 2005

Modified Files:
	xsrc/xfree/xc/extras/Xpm/lib: CrBufFrI.c CrDatFrI.c RdFToI.c WrFFrI.c
	    XpmI.h create.c data.c parse.c scan.c
	xsrc/xfree/xc/lib/Xpm: Imakefile
Removed Files:
	xsrc/xfree/xc/extras/Xpm/lib: s_popen.c

Log Message:
Restore Xorg implementation of Xpm.


To generate a diff of this commit:
cvs rdiff -r1.4 -r1.5 xsrc/xfree/xc/extras/Xpm/lib/CrBufFrI.c \
    xsrc/xfree/xc/extras/Xpm/lib/RdFToI.c \
    xsrc/xfree/xc/extras/Xpm/lib/WrFFrI.c xsrc/xfree/xc/extras/Xpm/lib/XpmI.h \
    xsrc/xfree/xc/extras/Xpm/lib/data.c
cvs rdiff -r1.5 -r1.6 xsrc/xfree/xc/extras/Xpm/lib/CrDatFrI.c \
    xsrc/xfree/xc/extras/Xpm/lib/parse.c xsrc/xfree/xc/extras/Xpm/lib/scan.c
cvs rdiff -r1.7 -r1.8 xsrc/xfree/xc/extras/Xpm/lib/create.c
cvs rdiff -r1.1.1.1 -r0 xsrc/xfree/xc/extras/Xpm/lib/s_popen.c
cvs rdiff -r1.1.1.4 -r1.2 xsrc/xfree/xc/lib/Xpm/Imakefile

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