]> git.ipfire.org Git - thirdparty/cups.git/commit - Makefile
Merge changes from CUPS 1.4svn-r8033.
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Wed, 8 Oct 2008 22:50:16 +0000 (22:50 +0000)
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Wed, 8 Oct 2008 22:50:16 +0000 (22:50 +0000)
commit58dc193312e27d25c0394e4fcb7a6eed7301b1ec
treef36e45a693b16fbf643e8c168180f02343b38431
parentf2245c695c43045dbdc825289307099c9c4559a2
Merge changes from CUPS 1.4svn-r8033.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1003 a1ca3aef-8c08-0410-bb20-df032aa958be
97 files changed:
CHANGES.txt
Makedefs.in
Makefile
backend/Makefile
backend/dnssd.c
backend/snmp-supplies.c
backend/usb-darwin.c
cgi-bin/Makefile
cgi-bin/admin.c
cgi-bin/cgi.h
cgi-bin/classes.c
cgi-bin/html.c
cgi-bin/ipp-var.c
cgi-bin/libcupscgi.exp
cgi-bin/printers.c
cgi-bin/var.c
conf/mime.convs.in
config-scripts/cups-common.m4
cups/adminutil.c
cups/file.c
cups/file.h
cups/libcups.exp
cups/testhttp.c
cups/testi18n.c
cups/transcode.c
cups/util.c
data/iso-8859-10 [deleted file]
data/iso-8859-13 [deleted file]
data/iso-8859-14 [deleted file]
data/iso-8859-15 [deleted file]
doc/Makefile
doc/cups.css
doc/help/overview.html
doc/help/ref-printers-conf.html
doc/help/spec-ipp.html
doc/help/spec-ppd.html
doc/help/whatsnew.html
doc/images/web-add-this-printer.gif [deleted file]
doc/images/web-password.gif [deleted file]
doc/images/web-printer-driver.gif [deleted file]
doc/images/web-printer-status.gif [deleted file]
doc/images/web-set-printer-options.gif [deleted file]
doc/images/web-test-page.gif [deleted file]
filter/bannertops.c
locale/cups_pt_PT.po [deleted file]
man/lpinfo.man
scheduler/classes.c
scheduler/client.c
scheduler/conf.c
scheduler/cups-driverd.cxx
scheduler/cupsd.h
scheduler/dirsvc.c
scheduler/ipp.c
scheduler/printers.c
scheduler/printers.h
systemv/lpinfo.c
templates/Makefile
templates/choose-device.tmpl
templates/class-added.tmpl
templates/class-confirm.tmpl
templates/class-deleted.tmpl
templates/class-modified.tmpl
templates/class.tmpl
templates/error-op.tmpl
templates/error.tmpl
templates/help-header.tmpl
templates/job-cancel.tmpl
templates/job-hold.tmpl
templates/job-move.tmpl
templates/job-moved.tmpl
templates/job-release.tmpl
templates/job-restart.tmpl
templates/jobs.tmpl
templates/maintenance.tmpl
templates/norestart.tmpl
templates/option-boolean.tmpl
templates/option-header.tmpl
templates/option-pickmany.tmpl
templates/option-pickone.tmpl
templates/option-trailer.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/restart.tmpl
templates/set-printer-options-header.tmpl
templates/set-printer-options-trailer.tmpl
templates/test-page.tmpl
tools/checkpo [deleted file]