]> git.ipfire.org Git - thirdparty/cups.git/commit - scheduler/printers.h
Merge changes from 1.4svn-r7979.
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Wed, 24 Sep 2008 21:31:49 +0000 (21:31 +0000)
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Wed, 24 Sep 2008 21:31:49 +0000 (21:31 +0000)
commit0af14961a854522d785f6716459b8fb951632963
treecbe941f7a54266cc0995a59897309f78fe2c299c
parentb19ccc9e271691cc71a08e9968c58f464ebeade5
Merge changes from 1.4svn-r7979.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@983 a1ca3aef-8c08-0410-bb20-df032aa958be
59 files changed:
CHANGES-1.3.txt
CHANGES.txt
backend/usb-darwin.c
cgi-bin/admin.c
config-scripts/cups-defaults.m4
cups/adminutil.c
cups/api-filter.shtml
doc/cups.css
doc/help/ref-cupsd-conf.html.in
filter/pstops.c
man/cupsd.conf.man.in
man/filter.man
scheduler/classes.c
scheduler/classes.h
scheduler/client.c
scheduler/conf.c
scheduler/conf.h
scheduler/cupsd.h
scheduler/dirsvc.c
scheduler/ipp.c
scheduler/job.c
scheduler/main.c
scheduler/printers.c
scheduler/printers.h
templates/add-class.tmpl
templates/add-printer.tmpl
templates/admin.tmpl
templates/choose-device.tmpl
templates/choose-make.tmpl
templates/choose-model.tmpl
templates/choose-serial.tmpl
templates/choose-uri.tmpl
templates/class-added.tmpl
templates/class-confirm.tmpl
templates/class-deleted.tmpl
templates/class-modified.tmpl
templates/error-op.tmpl
templates/error.tmpl
templates/list-available-printers.tmpl
templates/maintenance.tmpl
templates/modify-class.tmpl
templates/modify-printer.tmpl
templates/printer-accept.tmpl
templates/printer-added.tmpl
templates/printer-configured.tmpl
templates/printer-confirm.tmpl
templates/printer-default.tmpl
templates/printer-deleted.tmpl
templates/printer-modified.tmpl
templates/printer-purge.tmpl
templates/printer-reject.tmpl
templates/printer-start.tmpl
templates/printer-stop.tmpl
templates/printer.tmpl
templates/set-printer-options-header.tmpl
templates/set-printer-options-trailer.tmpl
templates/subscription-added.tmpl
templates/subscription-canceled.tmpl
templates/users.tmpl