]> git.ipfire.org Git - thirdparty/cups.git/commit
Merge changes from CUPS 1.6svn-r10510.
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Wed, 23 May 2012 22:51:18 +0000 (22:51 +0000)
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Wed, 23 May 2012 22:51:18 +0000 (22:51 +0000)
commita29fd7ddb5d63688a4d44d08e4ab16428921c321
treed8e716c51da91f08d468e90262417f9a6d6fd5b0
parentf3c17241a42a0845eae2099e6970b5aca9bbd836
Merge changes from CUPS 1.6svn-r10510.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3833 a1ca3aef-8c08-0410-bb20-df032aa958be
79 files changed:
CHANGES-1.5.txt
CHANGES.txt
INSTALL.txt
IPPTOOL.txt
Makedefs.in
Makefile
README.txt
backend/dnssd.c
backend/ipp.c
backend/snmp-supplies.c
backend/usb-libusb.c
berkeley/lpr.c
cgi-bin/makedocset.c
config-scripts/cups-common.m4
config-scripts/cups-dnssd.m4
config-scripts/cups-ssl.m4
config.h.in
cups/cups-private.h
cups/dest-job.c
cups/dest-localization.c
cups/dest-options.c
cups/dest.c
cups/http-addr.c
cups/http.c
cups/ipp.c
cups/language-private.h
cups/language.c
cups/page.c
cups/pwg-media.c
cups/pwg-private.h
cups/request.c
cups/testcups.c
cups/util.c
doc/help/api-cups.html
doc/help/api-ppd.html
doc/help/man-ipptoolfile.html
doc/help/ref-cupsd-conf.html.in
doc/help/spec-cmp.html
doc/help/spec-ppd.html
examples/ppdx.c [new file with mode: 0644]
examples/ppdx.h [new file with mode: 0644]
examples/testppdx.c [new file with mode: 0644]
examples/testppdx.ppd [new file with mode: 0644]
filter/spec-ppd.shtml
install-sh
man/cupsd.conf.man.in
man/filter.man
man/ipptoolfile.man
packaging/cups.list.in
scheduler/Makefile
scheduler/client.c
scheduler/colorman.c [new file with mode: 0644]
scheduler/colorman.h [new file with mode: 0644]
scheduler/conf.c
scheduler/conf.h
scheduler/cups-driverd.cxx
scheduler/cupsd.h
scheduler/dirsvc.c
scheduler/env.c
scheduler/ipp.c
scheduler/job.c
scheduler/job.h
scheduler/printers.c
scheduler/printers.h
scheduler/server.c
scheduler/sysman.c
scheduler/tls-darwin.c
systemv/lp.c
templates/jobs.tmpl
test/5.1-lpadmin.sh
test/5.5-lp.sh
test/5.6-lpr.sh
test/Makefile
test/ipp-1.1.test
test/ipptool.c
test/run-stp-tests.sh
test/testfile.pcl [new file with mode: 0644]
tools/testbtmm.c [new file with mode: 0644]
xcode/CUPS.xcodeproj/project.pbxproj