]> git.ipfire.org Git - thirdparty/cups.git/commit - berkeley/lpc.c
Merge changes from CUPS 1.6svn-r10390.
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Fri, 30 Mar 2012 05:59:14 +0000 (05:59 +0000)
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Fri, 30 Mar 2012 05:59:14 +0000 (05:59 +0000)
commit82cc1f9ac32564e92bfbbe7a1de416f4ebcc8584
treeaf43377451e06dac91d6639e35b1b5bf41d14d4e
parent3e7fe0ca760ad0054cf5c9ec7c90ca415cf6eb06
Merge changes from CUPS 1.6svn-r10390.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3755 a1ca3aef-8c08-0410-bb20-df032aa958be
91 files changed:
CHANGES-1.5.txt
CHANGES-IPPTOOL.txt
CHANGES.txt
Makedefs.in
backend/backend-private.h
backend/dnssd.c
backend/ipp.c
backend/network.c
backend/runloop.c
backend/snmp-supplies.c
backend/testbackend.c
berkeley/lpc.c
cgi-bin/admin.c
cgi-bin/help.c
cgi-bin/var.c
config-scripts/cups-common.m4
config-scripts/cups-defaults.m4
config-scripts/cups-ssl.m4
config-scripts/cups-ssl.m4.orig [new file with mode: 0644]
config.h.in
cups/api-httpipp.shtml
cups/cups-private.h
cups/cups.h
cups/dest-job.c
cups/dest-options.c
cups/dest.c
cups/http-addrlist.c
cups/http-support.c
cups/http.c
cups/ipp-private.h
cups/ipp-support.c
cups/ipp.c
cups/ipp.h
cups/language.c
cups/ppd-cache.c
cups/ppd.c
cups/ppd.h
cups/pwg-media.c
cups/request.c
cups/sidechannel.c
cups/snmp-private.h
cups/testconflicts.c
cups/util.c
doc/help/api-httpipp.html
doc/help/api-ppdc.html
doc/help/man-ipptoolfile.html
doc/help/ref-cupsd-conf.html.in
doc/help/spec-ppd.html
doc/index.html.in
filter/commandtops.c
filter/spec-ppd.shtml
install-sh
locale/cups.pot
locale/cups.strings
locale/po2strings.c
man/ipptoolfile.man
notifier/rss.c
ppdc/ppdc-file.cxx
ppdc/ppdc-source.cxx
ppdc/ppdc.h
scheduler/Makefile
scheduler/auth.c
scheduler/client.c
scheduler/client.h
scheduler/client.h.orig [new file with mode: 0644]
scheduler/conf.c
scheduler/cups-driverd.cxx
scheduler/cups-lpd.c
scheduler/cupsd.h
scheduler/job.c
scheduler/job.h
scheduler/main.c
scheduler/network.c
scheduler/printers.c
scheduler/tls-darwin.c [new file with mode: 0644]
scheduler/tls-gnutls.c [new file with mode: 0644]
scheduler/tls-openssl.c [new file with mode: 0644]
scheduler/tls.c [new file with mode: 0644]
systemv/cupstestppd.c
templates/admin.tmpl
templates/help-header.tmpl
templates/jobs.tmpl
templates/trailer.tmpl
test/Makefile
test/ipp-1.1.test
test/ipp-2.0.test
test/ipptool.c
test/run-stp-tests.sh
vcnet/config.h
vcnet/cups.sln
vcnet/libcups2-installer.vdproj [new file with mode: 0644]