]> git.ipfire.org Git - thirdparty/cups.git/commit - backend/backend-private.h
Merge changes from CUPS 1.5svn-r9602.
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Mon, 14 Mar 2011 18:45:10 +0000 (18:45 +0000)
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Mon, 14 Mar 2011 18:45:10 +0000 (18:45 +0000)
commitf14324a7920bee90b63469ce754e8040933f38e1
tree0077407e46ff904efd4601b99932c9abfd894030
parentc8fef167ba1e9d5d87fc77e4e99ca12ba9384cbb
Merge changes from CUPS 1.5svn-r9602.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3046 a1ca3aef-8c08-0410-bb20-df032aa958be
49 files changed:
CHANGES-1.4.txt
CHANGES.txt
backend/backend-private.h
backend/ipp.c
backend/lpd.c
backend/network.c
backend/pseudo [new file with mode: 0644]
backend/runloop.c
backend/snmp-supplies.c
backend/socket.c
backend/usb-libusb.c
cgi-bin/admin.c
cups/Makefile
cups/auth.c
cups/cups-private.h
cups/dest.c
cups/file.c
cups/globals.c
cups/libcups2.def
cups/libcups_s.exp
cups/mark.c
cups/ppd-cache.c [new file with mode: 0644]
cups/ppd-private.h
cups/ppd.c
cups/ppd.h
cups/pwg-file.c [deleted file]
cups/pwg-media.c
cups/pwg-ppd.c [deleted file]
cups/request.c
cups/sidechannel.c
cups/sidechannel.h
cups/testppd.c
cups/testpwg.c
filter/commandtops.c
filter/raster.c
filter/testraster.c
notifier/dbus.c
ppdc/sample.drv
scheduler/auth.c
scheduler/conf.c
scheduler/conf.h
scheduler/cups-driverd.cxx
scheduler/dirsvc.c
scheduler/ipp.c
scheduler/job.c
scheduler/main.c
scheduler/printers.c
scheduler/printers.h
test/run-stp-tests.sh