]> git.ipfire.org Git - thirdparty/cups.git/commit - man/cupsaccept.man
Merge changes from CUPS 1.7svn-r10791.
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Thu, 10 Jan 2013 17:01:44 +0000 (17:01 +0000)
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Thu, 10 Jan 2013 17:01:44 +0000 (17:01 +0000)
commit0fa6c7fa54164ee70ee9ccfa936b889a637d5ecd
treed84095ec3813ddd6d09ac71499ab00df3f9450f2
parentc1420c8744235de1249c34b956b7c11ccafd659d
Merge changes from CUPS 1.7svn-r10791.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@4120 a1ca3aef-8c08-0410-bb20-df032aa958be
94 files changed:
CHANGES-1.6.txt
CHANGES-IPPTOOL.txt
IPPTOOL.txt
README.txt
backend/ipp.c
backend/usb-darwin.c
backend/usb-libusb.c
cgi-bin/Makefile
conf/cups-files.conf.in
config-scripts/cups-common.m4
config-scripts/cups-gssapi.m4
config.h.in
cups/dest-options.c
cups/http-private.h
cups/http-support.c
cups/http.c
cups/http.h
cups/ipp-support.c
cups/ipp.c
cups/request.c
cups/versioning.h
doc/Makefile
doc/ca/index.html.in
doc/es/index.html.in
doc/help/man-ipptoolfile.html
doc/help/spec-browsing.html
doc/index.html.in
doc/ja/index.html.in
filter/Makefile
filter/pstops.c
man/backend.man
man/cancel.man
man/classes.conf.man
man/client.conf.man.in
man/cups-config.man
man/cups-deviced.man.in
man/cups-driverd.man.in
man/cups-files.conf.man.in
man/cups-lpd.man.in
man/cups-snmp.conf.man
man/cups-snmp.man.in
man/cupsaccept.man
man/cupsaddsmb.man.in
man/cupsctl.man
man/cupsd.conf.man.in
man/cupsd.man.in
man/cupsenable.man
man/cupsfilter.man
man/cupstestdsc.man
man/cupstestppd.man
man/filter.man
man/ipptool.man
man/ipptoolfile.man
man/lp.man
man/lpadmin.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/notifier.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
ppdc/Makefile
scheduler/Makefile
scheduler/auth.c
scheduler/cert.c
scheduler/cert.h
scheduler/client.c
scheduler/colorman.c
scheduler/conf.c
scheduler/cupsd.h
scheduler/cupsfilter.c
scheduler/job.c
scheduler/main.c
templates/ca/trailer.tmpl
templates/es/trailer.tmpl
templates/ja/trailer.tmpl
templates/trailer.tmpl
test/ippserver.c
test/ipptool.c