Merge changes from CUPS 1.5svn-r9641
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Wed, 23 Mar 2011 00:05:29 +0000 (00:05 +0000)
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Wed, 23 Mar 2011 00:05:29 +0000 (00:05 +0000)
commit84315f460a5c9eb38f7fcc4204acf98ed2b29406
tree13135924a24fee3f340569f7cd39e00d087dced9
parent82f972324ddde683be8a6d302f9937532ab0cf81
Merge changes from CUPS 1.5svn-r9641

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3071 a1ca3aef-8c08-0410-bb20-df032aa958be
47 files changed:
Makefile
backend/ipp.c
backend/usb-darwin.c
berkeley/lpq.c
berkeley/lpr.c
config-scripts/cups-common.m4
config.h.in
cups/Makefile
cups/adminutil.c
cups/http-support.c
cups/http.c
cups/langprintf.c
cups/localize.c
cups/pwg-media.c
cups/transcode.c
data/media.defs
doc/help/spec-raster.html
locale/Makefile
locale/cups.pot
locale/cups.strings
locale/cups_zh_TW.po
locale/po2strings.c
ppdc/ppdc.cxx
ppdc/ppdhtml.cxx
ppdc/ppdi.cxx
ppdc/ppdmerge.cxx
ppdc/ppdpo.cxx
scheduler/Makefile
scheduler/conf.c
scheduler/cupsfilter.c
scheduler/dirsvc.c
scheduler/dirsvc.h
scheduler/ipp.c
scheduler/job.c
scheduler/main.c
scheduler/printers.c
scheduler/server.c
scheduler/sysman.c
systemv/cancel.c
systemv/cupsaddsmb.c
systemv/cupsctl.c
systemv/cupstestppd.c
systemv/lp.c
templates/pl/admin.tmpl
templates/pl/help-header.tmpl
test/ipptool.c
xcode/CUPS.xcodeproj/project.pbxproj