]> git.ipfire.org Git - thirdparty/cups.git/commit
Merge changes from CUPS 1.5b1-r9774.
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Thu, 12 May 2011 06:22:31 +0000 (06:22 +0000)
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Thu, 12 May 2011 06:22:31 +0000 (06:22 +0000)
commit321d8d57dacf00e4ae19558dc9444519f4d9ade1
tree6f07778268fd2099c235dd4d2f2d4aa38fcb0110
parenteac3a0a01bf37d95f4129b28296cb697c54b2613
Merge changes from CUPS 1.5b1-r9774.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3247 a1ca3aef-8c08-0410-bb20-df032aa958be
176 files changed:
CHANGES.txt
INSTALL.txt
IPPTOOL.txt
LICENSE.txt
README.txt
backend/Dependencies
backend/dnssd.c
backend/ieee1284.c
backend/ipp.c
backend/parallel.c
backend/testsupplies.c
backend/usb-darwin.c
backend/usb-unix.c
backend/usb.c
berkeley/Makefile
cgi-bin/help-index.c
cgi-bin/help-index.h
cgi-bin/help.c
cgi-bin/ipp-var.c
cgi-bin/jobs.c
cgi-bin/search.c
cgi-bin/testcgi.c
cgi-bin/testhi.c
cgi-bin/testtemplate.c
conf/Makefile
config-scripts/cups-3264.m4
config-scripts/cups-common.m4
config-scripts/cups-compiler.m4
config-scripts/cups-directories.m4
config-scripts/cups-dnssd.m4
config-scripts/cups-gssapi.m4
config-scripts/cups-largefile.m4
config-scripts/cups-ldap.m4
config-scripts/cups-libtool.m4
config-scripts/cups-manpages.m4
config-scripts/cups-network.m4
config-scripts/cups-opsys.m4
config-scripts/cups-pam.m4
config-scripts/cups-poll.m4
config-scripts/cups-slp.m4
config-scripts/cups-threads.m4
cups/Dependencies
cups/api-array.header
cups/api-cups.header
cups/api-filedir.header
cups/api-filter.header
cups/api-httpipp.header
cups/api-overview.header
cups/api-ppd.header
cups/array.c
cups/auth.c
cups/backend.h
cups/cups.h
cups/dir.h
cups/emit.c
cups/file.c
cups/file.h
cups/http-addrlist.c
cups/http-private.h
cups/http.c
cups/http.h
cups/ipp.h
cups/language.h
cups/ppd-cache.c
cups/ppd.h
cups/raster.h
cups/sidechannel.h
cups/snmp.c
cups/sspi.c
cups/test2.ppd
cups/transcode.h
cups/usersys.c
data/Makefile
doc/help/api-array.html
doc/help/api-cups.html
doc/help/api-filedir.html
doc/help/api-filter.html
doc/help/api-httpipp.html
doc/help/api-mime.html
doc/help/api-overview.html
doc/help/api-ppd.html
doc/help/api-raster.html
doc/help/license.html
examples/Makefile
filter/bannertops.c
filter/common.c
filter/error.c
filter/image-bmp.c
filter/image-gif.c
filter/image-jpeg.c
filter/image-photocd.c
filter/image-pix.c
filter/image-png.c
filter/image-pnm.c
filter/image-sgi.c
filter/image-sgi.h
filter/image-sgilib.c
filter/image-sun.c
filter/image-tiff.c
filter/image.c
filter/image.h
filter/rasterbench.c
filter/rastertolabel.c
filter/testimage.c
fonts/Makefile
locale/Makefile
locale/cups_es.po
locale/cups_eu.po
locale/cups_id.po
locale/cups_ja.po
man/cancel.man
man/classes.conf.man
man/cups-config.man
man/cups-deviced.man.in
man/cups-lpd.man.in
man/cups-polld.man
man/cups-snmp.conf.man
man/cupsaccept.man
man/cupsaddsmb.man.in
man/cupsd.conf.man.in
man/cupsd.man.in
man/cupsenable.man
man/cupstestdsc.man
man/cupstestppd.man
man/filter.man
man/ipptoolfile.man
man/lpc.man
man/lpinfo.man
man/lpmove.man
man/lpoptions.man.in
man/lppasswd.man
man/lpq.man
man/lpr.man
man/lprm.man
man/lpstat.man
man/mailto.conf.man
man/mime.convs.man
man/mime.types.man
man/ppdc.man
man/ppdcfile.man
man/ppdhtml.man
man/ppdi.man
man/ppdmerge.man
man/ppdpo.man
man/printers.conf.man
man/subscriptions.conf.man
monitor/Makefile
notifier/Makefile
ppdc/foo.drv
scheduler/Dependencies
scheduler/Makefile
scheduler/classes.c
scheduler/client.c
scheduler/conf.c
scheduler/cups.sh.in
scheduler/cupsd.h
scheduler/cupsfilter.c
scheduler/dirsvc.c
scheduler/file.c [new file with mode: 0644]
scheduler/ipp.c
scheduler/job.c
scheduler/main.c
scheduler/printers.c
scheduler/removefile.c [deleted file]
scheduler/subscriptions.c
scheduler/sysman.c
scripting/php/Makefile
scripting/php/phpcups.c
scripting/php/phpcups.h
scripting/php/phpcups.php
templates/Makefile
templates/ru/Makefile
test/ipptool.c
test/testfile.ps
test/testps.ppd
xcode/CUPS.xcodeproj/project.pbxproj