Merge changes from CUPS 1.6svn-r9939.
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Wed, 31 Aug 2011 01:58:55 +0000 (01:58 +0000)
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Wed, 31 Aug 2011 01:58:55 +0000 (01:58 +0000)
commita48458814a4c26a6430b27105c0ab747c907473f
tree321dfed9e981030f7d4e14ef9a2c8185c9ce9eb9
parent771bd8cbffe1ffb06d90b2c7f00191830e6b738c
Merge changes from CUPS 1.6svn-r9939.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3392 a1ca3aef-8c08-0410-bb20-df032aa958be
136 files changed:
CHANGES-1.5.txt [new file with mode: 0644]
CHANGES.txt
Makedefs.in
Makefile
backend/Dependencies
backend/Makefile
backend/easysw-firewire-design.txt [deleted file]
backend/easysw-firewire-linux.txt [deleted file]
backend/ipp.c
backend/parallel.c [deleted file]
backend/serial.c [deleted file]
backend/snmp-supplies.c
backend/usb-darwin.c
conf/mime.convs.in
config-scripts/cups-common.m4
config-scripts/cups-defaults.m4
config-scripts/cups-image.m4 [deleted file]
config-scripts/cups-pap.m4 [deleted file]
config-scripts/cups-pdf.m4 [deleted file]
config-scripts/cups-scripting.m4
config-scripts/cups-sharedlibs.m4
configure.in
cups-config.in
cups/Makefile
cups/cups.h
cups/http.c
cups/libcups.exp [deleted file]
cups/libcups.order [deleted file]
cups/mark.c
cups/ppd-cache.c
cups/ppd.c
cups/raster-private.h [new file with mode: 0644]
cups/request.c
cups/testfile.c
data/Makefile
data/escp.h [deleted file]
data/pcl.h [deleted file]
data/psglyphs [deleted file]
data/utf-8 [deleted file]
driver/Dependencies [deleted file]
driver/Makefile [deleted file]
driver/api-driver.header [deleted file]
driver/api-driver.shtml [deleted file]
driver/attr.c [deleted file]
driver/check.c [deleted file]
driver/cmyk.c [deleted file]
driver/commandtoescpx.c [deleted file]
driver/commandtopclx.c [deleted file]
driver/dither.c [deleted file]
driver/driver.h [deleted file]
driver/image.pgm [deleted file]
driver/image.ppm [deleted file]
driver/libcupsdriver.exp [deleted file]
driver/lut.c [deleted file]
driver/pack.c [deleted file]
driver/pcl-common.c [deleted file]
driver/pcl-common.h [deleted file]
driver/rastertoescpx.c [deleted file]
driver/rastertopclx.c [deleted file]
driver/rgb.c [deleted file]
driver/srgb.c [deleted file]
driver/testcmyk.c [deleted file]
driver/testdither.c [deleted file]
driver/testdriver.c [deleted file]
driver/testrgb.c [deleted file]
filter/Dependencies
filter/Makefile
filter/bannertops.c [deleted file]
filter/error.c
filter/image-bmp.c [deleted file]
filter/image-colorspace.c [deleted file]
filter/image-gif.c [deleted file]
filter/image-jpeg.c [deleted file]
filter/image-photocd.c [deleted file]
filter/image-pix.c [deleted file]
filter/image-png.c [deleted file]
filter/image-pnm.c [deleted file]
filter/image-private.h [deleted file]
filter/image-sgi.c [deleted file]
filter/image-sgi.h [deleted file]
filter/image-sgilib.c [deleted file]
filter/image-sun.c [deleted file]
filter/image-tiff.c [deleted file]
filter/image-zoom.c [deleted file]
filter/image.c [deleted file]
filter/image.h [deleted file]
filter/imagetops.c [deleted file]
filter/imagetoraster.c [deleted file]
filter/interpret.c
filter/libcupsimage.order [deleted file]
filter/pdftops.c [deleted file]
filter/pstext.c [deleted file]
filter/pstext.h [deleted file]
filter/pstops.c
filter/raster.c
filter/testimage.c [deleted file]
filter/testraster.c
filter/textcommon.c [deleted file]
filter/textcommon.h [deleted file]
filter/texttops.c [deleted file]
fonts/Makefile [deleted file]
fonts/Monospace [deleted file]
fonts/Monospace-Bold [deleted file]
fonts/Monospace-BoldOblique [deleted file]
fonts/Monospace-Oblique [deleted file]
locale/ppdc.pot [deleted file]
packaging/cups.list.in
packaging/cups.spec.in
ppdc/Dependencies
ppdc/libcupsppdc.exp [deleted file]
ppdc/ppdc-source.cxx
ppdc/sample.drv
scheduler/client.c
scheduler/conf.c
scheduler/cups-driverd.cxx
scheduler/cups-exec.c
scheduler/cupsd.order [deleted file]
scheduler/job.c
scheduler/log.c
scripting/perl/CUPS.pm [deleted file]
scripting/perl/CUPS.xs [deleted file]
scripting/perl/Makefile.PL [deleted file]
scripting/perl/README [deleted file]
scripting/perl/test.pl [deleted file]
scripting/php/Dependencies [deleted file]
scripting/php/Makefile [deleted file]
scripting/php/README [deleted file]
scripting/php/phpcups.c [deleted file]
scripting/php/phpcups.h [deleted file]
scripting/php/phpcups.php [deleted file]
systemv/cupstestppd.c
templates/maintenance.tmpl [deleted file]
test/ipptool.c
test/run-stp-tests.sh
test/str-header.html
tools/makedocset [deleted file]