Merge changes from CUPS 1.6svn-r9968.
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Wed, 7 Sep 2011 22:31:27 +0000 (22:31 +0000)
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Wed, 7 Sep 2011 22:31:27 +0000 (22:31 +0000)
commit85dda01c84763aecc4d31e15246d0ac5986eedae
tree4f8b999e8443b1c8def8c79d70338bd4e0179e29
parenta48458814a4c26a6430b27105c0ab747c907473f
Merge changes from CUPS 1.6svn-r9968.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3411 a1ca3aef-8c08-0410-bb20-df032aa958be
67 files changed:
CHANGES-1.5.txt
CHANGES.txt
Makefile
backend/Dependencies
backend/dnssd.c
backend/ipp.c
backend/testbackend.c
berkeley/Dependencies
berkeley/lpq.c
cgi-bin/Dependencies
cgi-bin/help-index.c
cgi-bin/var.c
config-scripts/cups-compiler.m4
cups/Dependencies
cups/auth.c
cups/cups.h
cups/debug-private.h
cups/file.c
cups/file.h
cups/http-private.h
cups/http-support.c
cups/http.c
cups/http.h
cups/language-private.h
cups/raster-private.h
cups/request.c
cups/string-private.h
cups/testsnmp.c
cups/usersys.c
cups/versioning.h
filter/Dependencies
filter/interpret.c
filter/pstops.c
locale/Dependencies
man/client.conf.man.in
monitor/Dependencies
notifier/Dependencies
ppdc/Dependencies
scheduler/Dependencies
scheduler/auth.c
scheduler/client.c
scheduler/conf.h
scheduler/cups.sh.in
scheduler/cupsd.h
scheduler/cupsfilter.c
scheduler/ipp.c
scheduler/job.c
scheduler/job.h
scheduler/log.c
scheduler/main.c
scheduler/mime-private.h
scheduler/testdirsvc.c
scheduler/testlpd.c
scheduler/testspeed.c
scheduler/testsub.c
systemv/Dependencies
systemv/Makefile
systemv/cupsaddsmb.c
systemv/cupsctl.c
systemv/cupstestdsc.c
systemv/cupstestppd.c
systemv/lpoptions.c
systemv/lppasswd.c
test/Dependencies
test/ippserver.c
test/ipptool.c
test/run-stp-tests.sh