]> git.ipfire.org Git - thirdparty/cups.git/commit
Merge changes from CUPS 1.5svn-r9717.
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Fri, 22 Apr 2011 23:02:56 +0000 (23:02 +0000)
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Fri, 22 Apr 2011 23:02:56 +0000 (23:02 +0000)
commit22c9029b44a790ba1ee894027431dcea1ec2aeab
tree20e787f4b9f7c9c574cf3450bf8326c83192fe39
parent07ed0e9a4385437b52e7195b681e600c2f1c5623
Merge changes from CUPS 1.5svn-r9717.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3171 a1ca3aef-8c08-0410-bb20-df032aa958be
67 files changed:
CHANGES-1.4.txt
Makedefs.in
backend/ipp.c
backend/lpd.c
backend/snmp.c
backend/socket.c
backend/usb-darwin.c
config-scripts/cups-compiler.m4
cups/Dependencies
cups/api-filter.shtml
cups/auth.c
cups/backend.h
cups/file-private.h
cups/file.c
cups/http-addr.c
cups/http-addrlist.c
cups/http-private.h
cups/http.c
cups/libcups2.def
cups/libcups_s.exp
cups/ppd-cache.c
cups/request.c
cups/snmp.c
cups/transcode.c
data/media.defs
doc/help/accounting.html
doc/help/api-cups.html
doc/help/api-filedir.html
doc/help/api-filter.html
doc/help/api-mime.html
doc/help/spec-ppd.html
filter/Dependencies
filter/spec-ppd.header
filter/spec-ppd.shtml
locale/cups.pot
locale/cups.strings
man/backend.man
notifier/Dependencies
scheduler/client.c
scheduler/conf.c
scheduler/conf.h
scheduler/cups-deviced.c
scheduler/cups-driverd.cxx
scheduler/cups-exec.c
scheduler/cups-polld.c
scheduler/cupsd.h
scheduler/dirsvc.c
scheduler/filter.c
scheduler/ipp.c
scheduler/job.c
scheduler/listen.c
scheduler/log.c
scheduler/main.c
scheduler/mime.c
scheduler/network.c
scheduler/org.cups.cupsd.plist
scheduler/printers.c
scheduler/process.c
scheduler/testdirsvc.c
scheduler/testmime.c
scheduler/type.c
scheduler/util.c
scheduler/util.h
systemv/cupstestppd.c
test/get-jobs.test
test/ippserver.c
xcode/CUPS.xcodeproj/project.pbxproj