]> git.ipfire.org Git - thirdparty/cups.git/commit - cups/options.c
Merge changes from CUPS 1.6svn-r10437.
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Mon, 23 Apr 2012 22:44:16 +0000 (22:44 +0000)
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Mon, 23 Apr 2012 22:44:16 +0000 (22:44 +0000)
commitf3c17241a42a0845eae2099e6970b5aca9bbd836
treee511e108810d2b80f72ff6cee5efafba472beb6a
parent271780fb877d849c9f41616f338e1e9dd2d69409
Merge changes from CUPS 1.6svn-r10437.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3794 a1ca3aef-8c08-0410-bb20-df032aa958be
216 files changed:
CHANGES-1.5.txt
CHANGES.txt
INSTALL.txt
LICENSE.txt
README.txt
backend/Dependencies
backend/Makefile
backend/dnssd.c
backend/ipp.c
backend/lpd.c
backend/runloop.c
backend/socket.c
backend/usb-darwin.c
backend/usb-unix.c
berkeley/Dependencies
cgi-bin/admin.c
cgi-bin/classes.c
cgi-bin/ipp-var.c
cgi-bin/jobs.c
cgi-bin/printers.c
config-scripts/cups-common.m4
config-scripts/cups-defaults.m4
config-scripts/cups-directories.m4
config-scripts/cups-gssapi.m4
config-scripts/cups-manpages.m4
config-scripts/cups-pam.m4
config.h.in
configure.in
cups/Dependencies
cups/adminutil.c
cups/api-filter.shtml
cups/api-ppd.header
cups/api-ppd.shtml
cups/array.c
cups/attr.c
cups/auth.c
cups/backchannel.c
cups/backend.c
cups/conflicts.c
cups/cups.h
cups/custom.c
cups/dest-job.c
cups/dest-localization.c
cups/dest-options.c
cups/dest.c
cups/dir.c
cups/emit.c
cups/encode.c
cups/file.c
cups/getdevices.c
cups/getputfile.c
cups/globals.c
cups/http-addr.c
cups/http-addrlist.c
cups/http-private.h
cups/http-support.c
cups/http.c
cups/http.h
cups/ipp-support.c
cups/ipp.c
cups/ipp.h
cups/localize.c
cups/mark.c
cups/notify.c
cups/options.c
cups/page.c
cups/ppd.c
cups/ppd.h
cups/pwg-media.c
cups/raster-private.h
cups/raster.h
cups/request.c
cups/sidechannel.c
cups/sidechannel.h
cups/snmp-private.h
cups/snmp.c
cups/tempfile.c
cups/testpwg.c
cups/thread-private.h
cups/thread.c
cups/usersys.c
cups/util.c
cups/versioning.h
data/media.defs
doc/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-ppd.html
doc/help/api-raster.html
doc/help/kerberos.html
doc/help/license.html
doc/help/man-ipptool.html
doc/help/network.html
doc/help/postscript-driver.html
doc/help/ppd-compiler.html
doc/help/raster-driver.html
doc/help/ref-classes-conf.html
doc/help/ref-client-conf.html
doc/help/ref-cupsd-conf.html.in
doc/help/ref-ppdcfile.html
doc/help/ref-printers-conf.html
doc/help/ref-snmp-conf.html
doc/help/sharing.html
doc/help/spec-cmp.html
doc/help/spec-ipp.html
doc/help/spec-postscript.html
doc/help/spec-ppd.html
filter/Dependencies
filter/api-raster.shtml
filter/commandtops.c
filter/error.c
filter/gziptoany.c
filter/interpret.c
filter/postscript-driver.header
filter/postscript-driver.shtml
filter/ppd-compiler.shtml
filter/pstops.c
filter/raster-driver.header
filter/raster-driver.shtml
filter/raster.c
filter/rastertoepson.c
filter/rastertohp.c
filter/rastertolabel.c
filter/spec-ppd.shtml
locale/Dependencies
locale/Makefile
locale/cups.pot
locale/cups.strings
man/Makefile
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-lpd.man.in
man/cups-polld.man
man/cups-snmp.conf.man
man/cups-snmp.man.in [new file with mode: 0644]
man/cupsaccept.man
man/cupsaddsmb.man.in
man/cupsctl.man
man/cupsd.man.in
man/cupsenable.man
man/cupsfilter.man
man/cupstestdsc.man
man/cupstestppd.man
man/filter.man
man/ipptool.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/ppdcfile.man
man/ppdhtml.man
man/ppdi.man
man/ppdmerge.man
man/ppdpo.man
man/printers.conf.man
man/subscriptions.conf.man
monitor/Dependencies
notifier/Dependencies
packaging/InstallationCheck
packaging/cups.list.in
packaging/cups.spec.in
ppdc/Dependencies
ppdc/ppdc-catalog.cxx
ppdc/ppdc.cxx
ppdc/ppdpo.cxx
ppdc/sample.drv
scheduler/Dependencies
scheduler/Makefile
scheduler/avahi.c [deleted file]
scheduler/avahi.h [deleted file]
scheduler/client.c
scheduler/conf.c
scheduler/conf.h
scheduler/cups-driverd.cxx
scheduler/cups-exec.c
scheduler/cupsd.h
scheduler/cupsfilter.c
scheduler/dirsvc.c
scheduler/dirsvc.h
scheduler/job.c
scheduler/main.c
scheduler/printers.c
scheduler/printers.h
scheduler/process.c
scheduler/timeout.c [deleted file]
scheduler/util.c
systemv/Dependencies
systemv/cupsaddsmb.c
systemv/cupsctl.c
systemv/cupstestppd.c
templates/error.tmpl
test/Dependencies
test/ipp-1.1.test
test/ipptool.c
test/run-stp-tests.sh
vcnet/config.h
xcode/CUPS.xcodeproj/project.pbxproj