]> git.ipfire.org Git - thirdparty/cups.git/commit - scheduler/cups-driverd.cxx
Merge changes from CUPS 1.5rc1-r9833.
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Wed, 15 Jun 2011 00:37:13 +0000 (00:37 +0000)
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Wed, 15 Jun 2011 00:37:13 +0000 (00:37 +0000)
commitf99f36983167d7ff4b3cf3348a252a465c48ff9c
treeb25381a9c6c206ff4ac9374bacefc560cee08a1d
parentd4d033982cd67de6be9e472ff79a5538874c1651
Merge changes from CUPS 1.5rc1-r9833.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3318 a1ca3aef-8c08-0410-bb20-df032aa958be
20 files changed:
CHANGES.txt
INSTALL.txt
README.txt
backend/ieee1284.c
backend/runloop.c
backend/usb-libusb.c
config-scripts/cups-common.m4
config-scripts/cups-compiler.m4
cups/conflicts.c
cups/http-support.c
cups/transcode.c
packaging/cups.spec.in
scheduler/client.c
scheduler/conf.c
scheduler/cups-driverd.cxx
scheduler/ipp.c
scheduler/job.c
scheduler/sysman.c
test/ipp-1.1.test
test/ipptool.c