]> git.ipfire.org Git - thirdparty/cups.git/commit
projects / thirdparty / cups.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a29fd7d) | patch
Merge changes from CUPS 1.7svn-r10578.
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Wed, 29 Aug 2012 00:26:48 +0000 (00:26 +0000)
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Wed, 29 Aug 2012 00:26:48 +0000 (00:26 +0000)
commit37e7e6e0b27c7db3be8e160e87a63fec66e0fcca
tree08d7d4e2e80a04c648bc0137f9c8f3c26f0760fbtree | snapshot
parenta29fd7ddb5d63688a4d44d08e4ab16428921c321commit | diff
Merge changes from CUPS 1.7svn-r10578.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3891 a1ca3aef-8c08-0410-bb20-df032aa958be
266 files changed:
CHANGES-1.5.txt diff | blob | blame | history
CHANGES-1.6.txt [new file with mode: 0644] blob
CHANGES-IPPTOOL.txt diff | blob | blame | history
CHANGES.txt diff | blob | blame | history
CREDITS.txt diff | blob | blame | history
INSTALL.txt diff | blob | blame | history
README.txt diff | blob | blame | history
backend/Makefile diff | blob | blame | history
backend/ipp.c diff | blob | blame | history
backend/lpd.c diff | blob | blame | history
backend/snmp.c diff | blob | blame | history
backend/usb-libusb.c diff | blob | blame | history
berkeley/lpq.c diff | blob | blame | history
conf/cupsd.conf.in diff | blob | blame | history
config-scripts/cups-common.m4 diff | blob | blame | history
config-scripts/cups-ssl.m4 diff | blob | blame | history
config.h.in diff | blob | blame | history
cups/Makefile diff | blob | blame | history
cups/cups.h diff | blob | blame | history
cups/dest.c diff | blob | blame | history
cups/http.c diff | blob | blame | history
cups/language.c diff | blob | blame | history
cups/util.c diff | blob | blame | history
desktop/cups.desktop.in diff | blob | blame | history
doc/ca/index.html.in [new file with mode: 0644] blob
doc/es/index.html.in [new file with mode: 0644] blob
doc/help/options.html diff | blob | blame | history
doc/help/overview.html diff | blob | blame | history
doc/help/whatsnew.html diff | blob | blame | history
doc/index.html.in diff | blob | blame | history
doc/ja/index.html.in [new file with mode: 0644] blob
locale/cups.pot diff | blob | blame | history
locale/cups.strings diff | blob | blame | history
locale/cups_ca.po [new file with mode: 0644] blob
locale/cups_es.po [new file with mode: 0644] blob
locale/cups_ja.po [new file with mode: 0644] blob
man/Makefile diff | blob | blame | history
man/cups-polld.man [deleted file] blob | blame | history
man/cupsctl.man diff | blob | blame | history
man/cupsfilter.man diff | blob | blame | history
man/lp.man diff | blob | blame | history
man/lpadmin.man diff | blob | blame | history
packaging/cups.spec.in diff | blob | blame | history
ppdc/sample.drv diff | blob | blame | history
scheduler/client.c diff | blob | blame | history
scheduler/colorman.c diff | blob | blame | history
scheduler/conf.c diff | blob | blame | history
scheduler/cups-exec.c diff | blob | blame | history
scheduler/cups-lpd.c diff | blob | blame | history
scheduler/ipp.c diff | blob | blame | history
scheduler/main.c diff | blob | blame | history
scheduler/printers.c diff | blob | blame | history
templates/ca/add-class.tmpl [new file with mode: 0644] blob
templates/ca/add-printer.tmpl [new file with mode: 0644] blob
templates/ca/add-rss-subscription.tmpl [new file with mode: 0644] blob
templates/ca/admin.tmpl [new file with mode: 0644] blob
templates/ca/choose-device.tmpl [new file with mode: 0644] blob
templates/ca/choose-make.tmpl [new file with mode: 0644] blob
templates/ca/choose-model.tmpl [new file with mode: 0644] blob
templates/ca/choose-serial.tmpl [new file with mode: 0644] blob
templates/ca/choose-uri.tmpl [new file with mode: 0644] blob
templates/ca/class-added.tmpl [new file with mode: 0644] blob
templates/ca/class-confirm.tmpl [new file with mode: 0644] blob
templates/ca/class-deleted.tmpl [new file with mode: 0644] blob
templates/ca/class-jobs-header.tmpl [new file with mode: 0644] blob
templates/ca/class-modified.tmpl [new file with mode: 0644] blob
templates/ca/class.tmpl [new file with mode: 0644] blob
templates/ca/classes-header.tmpl [new file with mode: 0644] blob
templates/ca/classes.tmpl [new file with mode: 0644] blob
templates/ca/command.tmpl [new file with mode: 0644] blob
templates/ca/edit-config.tmpl [new file with mode: 0644] blob
templates/ca/error-op.tmpl [new file with mode: 0644] blob
templates/ca/error.tmpl [new file with mode: 0644] blob
templates/ca/header.tmpl.in [new file with mode: 0644] blob
templates/ca/help-header.tmpl [new file with mode: 0644] blob
templates/ca/help-printable.tmpl [new file with mode: 0644] blob
templates/ca/help-trailer.tmpl [new file with mode: 0644] blob
templates/ca/job-cancel.tmpl [new file with mode: 0644] blob
templates/ca/job-hold.tmpl [new file with mode: 0644] blob
templates/ca/job-move.tmpl [new file with mode: 0644] blob
templates/ca/job-moved.tmpl [new file with mode: 0644] blob
templates/ca/job-release.tmpl [new file with mode: 0644] blob
templates/ca/job-restart.tmpl [new file with mode: 0644] blob
templates/ca/jobs-header.tmpl [new file with mode: 0644] blob
templates/ca/jobs.tmpl [new file with mode: 0644] blob
templates/ca/list-available-printers.tmpl [new file with mode: 0644] blob
templates/ca/modify-class.tmpl [new file with mode: 0644] blob
templates/ca/modify-printer.tmpl [new file with mode: 0644] blob
templates/ca/norestart.tmpl [new file with mode: 0644] blob
templates/ca/option-boolean.tmpl [new file with mode: 0644] blob
templates/ca/option-conflict.tmpl [new file with mode: 0644] blob
templates/ca/option-header.tmpl [new file with mode: 0644] blob
templates/ca/option-pickmany.tmpl [new file with mode: 0644] blob
templates/ca/option-pickone.tmpl [new file with mode: 0644] blob
templates/ca/option-trailer.tmpl [new file with mode: 0644] blob
templates/ca/pager.tmpl [new file with mode: 0644] blob
templates/ca/printer-accept.tmpl [new file with mode: 0644] blob
templates/ca/printer-added.tmpl [new file with mode: 0644] blob
templates/ca/printer-configured.tmpl [new file with mode: 0644] blob
templates/ca/printer-confirm.tmpl [new file with mode: 0644] blob
templates/ca/printer-default.tmpl [new file with mode: 0644] blob
templates/ca/printer-deleted.tmpl [new file with mode: 0644] blob
templates/ca/printer-jobs-header.tmpl [new file with mode: 0644] blob
templates/ca/printer-modified.tmpl [new file with mode: 0644] blob
templates/ca/printer-purge.tmpl [new file with mode: 0644] blob
templates/ca/printer-reject.tmpl [new file with mode: 0644] blob
templates/ca/printer-start.tmpl [new file with mode: 0644] blob
templates/ca/printer-stop.tmpl [new file with mode: 0644] blob
templates/ca/printer.tmpl [new file with mode: 0644] blob
templates/ca/printers-header.tmpl [new file with mode: 0644] blob
templates/ca/printers.tmpl [new file with mode: 0644] blob
templates/ca/restart.tmpl [new file with mode: 0644] blob
templates/ca/samba-export.tmpl [new file with mode: 0644] blob
templates/ca/samba-exported.tmpl [new file with mode: 0644] blob
templates/ca/search.tmpl [new file with mode: 0644] blob
templates/ca/set-printer-options-header.tmpl [new file with mode: 0644] blob
templates/ca/set-printer-options-trailer.tmpl [new file with mode: 0644] blob
templates/ca/subscription-added.tmpl [new file with mode: 0644] blob
templates/ca/subscription-canceled.tmpl [new file with mode: 0644] blob
templates/ca/test-page.tmpl [new file with mode: 0644] blob
templates/ca/trailer.tmpl [new file with mode: 0644] blob
templates/ca/users.tmpl [new file with mode: 0644] blob
templates/es/add-class.tmpl [new file with mode: 0644] blob
templates/es/add-printer.tmpl [new file with mode: 0644] blob
templates/es/add-rss-subscription.tmpl [new file with mode: 0644] blob
templates/es/admin.tmpl [new file with mode: 0644] blob
templates/es/choose-device.tmpl [new file with mode: 0644] blob
templates/es/choose-make.tmpl [new file with mode: 0644] blob
templates/es/choose-model.tmpl [new file with mode: 0644] blob
templates/es/choose-serial.tmpl [new file with mode: 0644] blob
templates/es/choose-uri.tmpl [new file with mode: 0644] blob
templates/es/class-added.tmpl [new file with mode: 0644] blob
templates/es/class-confirm.tmpl [new file with mode: 0644] blob
templates/es/class-deleted.tmpl [new file with mode: 0644] blob
templates/es/class-jobs-header.tmpl [new file with mode: 0644] blob
templates/es/class-modified.tmpl [new file with mode: 0644] blob
templates/es/class.tmpl [new file with mode: 0644] blob
templates/es/classes-header.tmpl [new file with mode: 0644] blob
templates/es/classes.tmpl [new file with mode: 0644] blob
templates/es/command.tmpl [new file with mode: 0644] blob
templates/es/edit-config.tmpl [new file with mode: 0644] blob
templates/es/error-op.tmpl [new file with mode: 0644] blob
templates/es/error.tmpl [new file with mode: 0644] blob
templates/es/header.tmpl.in [new file with mode: 0644] blob
templates/es/help-header.tmpl [new file with mode: 0644] blob
templates/es/help-printable.tmpl [new file with mode: 0644] blob
templates/es/help-trailer.tmpl [new file with mode: 0644] blob
templates/es/job-cancel.tmpl [new file with mode: 0644] blob
templates/es/job-hold.tmpl [new file with mode: 0644] blob
templates/es/job-move.tmpl [new file with mode: 0644] blob
templates/es/job-moved.tmpl [new file with mode: 0644] blob
templates/es/job-release.tmpl [new file with mode: 0644] blob
templates/es/job-restart.tmpl [new file with mode: 0644] blob
templates/es/jobs-header.tmpl [new file with mode: 0644] blob
templates/es/jobs.tmpl [new file with mode: 0644] blob
templates/es/list-available-printers.tmpl [new file with mode: 0644] blob
templates/es/modify-class.tmpl [new file with mode: 0644] blob
templates/es/modify-printer.tmpl [new file with mode: 0644] blob
templates/es/norestart.tmpl [new file with mode: 0644] blob
templates/es/option-boolean.tmpl [new file with mode: 0644] blob
templates/es/option-conflict.tmpl [new file with mode: 0644] blob
templates/es/option-header.tmpl [new file with mode: 0644] blob
templates/es/option-pickmany.tmpl [new file with mode: 0644] blob
templates/es/option-pickone.tmpl [new file with mode: 0644] blob
templates/es/option-trailer.tmpl [new file with mode: 0644] blob
templates/es/pager.tmpl [new file with mode: 0644] blob
templates/es/printer-accept.tmpl [new file with mode: 0644] blob
templates/es/printer-added.tmpl [new file with mode: 0644] blob
templates/es/printer-configured.tmpl [new file with mode: 0644] blob
templates/es/printer-confirm.tmpl [new file with mode: 0644] blob
templates/es/printer-default.tmpl [new file with mode: 0644] blob
templates/es/printer-deleted.tmpl [new file with mode: 0644] blob
templates/es/printer-jobs-header.tmpl [new file with mode: 0644] blob
templates/es/printer-modified.tmpl [new file with mode: 0644] blob
templates/es/printer-purge.tmpl [new file with mode: 0644] blob
templates/es/printer-reject.tmpl [new file with mode: 0644] blob
templates/es/printer-start.tmpl [new file with mode: 0644] blob
templates/es/printer-stop.tmpl [new file with mode: 0644] blob
templates/es/printer.tmpl [new file with mode: 0644] blob
templates/es/printers-header.tmpl [new file with mode: 0644] blob
templates/es/printers.tmpl [new file with mode: 0644] blob
templates/es/restart.tmpl [new file with mode: 0644] blob
templates/es/samba-export.tmpl [new file with mode: 0644] blob
templates/es/samba-exported.tmpl [new file with mode: 0644] blob
templates/es/search.tmpl [new file with mode: 0644] blob
templates/es/set-printer-options-header.tmpl [new file with mode: 0644] blob
templates/es/set-printer-options-trailer.tmpl [new file with mode: 0644] blob
templates/es/subscription-added.tmpl [new file with mode: 0644] blob
templates/es/subscription-canceled.tmpl [new file with mode: 0644] blob
templates/es/test-page.tmpl [new file with mode: 0644] blob
templates/es/trailer.tmpl [new file with mode: 0644] blob
templates/es/users.tmpl [new file with mode: 0644] blob
templates/ja/add-class.tmpl [new file with mode: 0644] blob
templates/ja/add-printer.tmpl [new file with mode: 0644] blob
templates/ja/add-rss-subscription.tmpl [new file with mode: 0644] blob
templates/ja/admin.tmpl [new file with mode: 0644] blob
templates/ja/choose-device.tmpl [new file with mode: 0644] blob
templates/ja/choose-make.tmpl [new file with mode: 0644] blob
templates/ja/choose-model.tmpl [new file with mode: 0644] blob
templates/ja/choose-serial.tmpl [new file with mode: 0644] blob
templates/ja/choose-uri.tmpl [new file with mode: 0644] blob
templates/ja/class-added.tmpl [new file with mode: 0644] blob
templates/ja/class-confirm.tmpl [new file with mode: 0644] blob
templates/ja/class-deleted.tmpl [new file with mode: 0644] blob
templates/ja/class-jobs-header.tmpl [new file with mode: 0644] blob
templates/ja/class-modified.tmpl [new file with mode: 0644] blob
templates/ja/class.tmpl [new file with mode: 0644] blob
templates/ja/classes-header.tmpl [new file with mode: 0644] blob
templates/ja/classes.tmpl [new file with mode: 0644] blob
templates/ja/command.tmpl [new file with mode: 0644] blob
templates/ja/edit-config.tmpl [new file with mode: 0644] blob
templates/ja/error-op.tmpl [new file with mode: 0644] blob
templates/ja/error.tmpl [new file with mode: 0644] blob
templates/ja/header.tmpl.in [new file with mode: 0644] blob
templates/ja/help-header.tmpl [new file with mode: 0644] blob
templates/ja/help-printable.tmpl [new file with mode: 0644] blob
templates/ja/help-trailer.tmpl [new file with mode: 0644] blob
templates/ja/job-cancel.tmpl [new file with mode: 0644] blob
templates/ja/job-hold.tmpl [new file with mode: 0644] blob
templates/ja/job-move.tmpl [new file with mode: 0644] blob
templates/ja/job-moved.tmpl [new file with mode: 0644] blob
templates/ja/job-release.tmpl [new file with mode: 0644] blob
templates/ja/job-restart.tmpl [new file with mode: 0644] blob
templates/ja/jobs-header.tmpl [new file with mode: 0644] blob
templates/ja/jobs.tmpl [new file with mode: 0644] blob
templates/ja/list-available-printers.tmpl [new file with mode: 0644] blob
templates/ja/modify-class.tmpl [new file with mode: 0644] blob
templates/ja/modify-printer.tmpl [new file with mode: 0644] blob
templates/ja/norestart.tmpl [new file with mode: 0644] blob
templates/ja/option-boolean.tmpl [new file with mode: 0644] blob
templates/ja/option-conflict.tmpl [new file with mode: 0644] blob
templates/ja/option-header.tmpl [new file with mode: 0644] blob
templates/ja/option-pickmany.tmpl [new file with mode: 0644] blob
templates/ja/option-pickone.tmpl [new file with mode: 0644] blob
templates/ja/option-trailer.tmpl [new file with mode: 0644] blob
templates/ja/pager.tmpl [new file with mode: 0644] blob
templates/ja/printer-accept.tmpl [new file with mode: 0644] blob
templates/ja/printer-added.tmpl [new file with mode: 0644] blob
templates/ja/printer-configured.tmpl [new file with mode: 0644] blob
templates/ja/printer-confirm.tmpl [new file with mode: 0644] blob
templates/ja/printer-default.tmpl [new file with mode: 0644] blob
templates/ja/printer-deleted.tmpl [new file with mode: 0644] blob
templates/ja/printer-jobs-header.tmpl [new file with mode: 0644] blob
templates/ja/printer-modified.tmpl [new file with mode: 0644] blob
templates/ja/printer-purge.tmpl [new file with mode: 0644] blob
templates/ja/printer-reject.tmpl [new file with mode: 0644] blob
templates/ja/printer-start.tmpl [new file with mode: 0644] blob
templates/ja/printer-stop.tmpl [new file with mode: 0644] blob
templates/ja/printer.tmpl [new file with mode: 0644] blob
templates/ja/printers-header.tmpl [new file with mode: 0644] blob
templates/ja/printers.tmpl [new file with mode: 0644] blob
templates/ja/restart.tmpl [new file with mode: 0644] blob
templates/ja/samba-export.tmpl [new file with mode: 0644] blob
templates/ja/samba-exported.tmpl [new file with mode: 0644] blob
templates/ja/search.tmpl [new file with mode: 0644] blob
templates/ja/set-printer-options-header.tmpl [new file with mode: 0644] blob
templates/ja/set-printer-options-trailer.tmpl [new file with mode: 0644] blob
templates/ja/subscription-added.tmpl [new file with mode: 0644] blob
templates/ja/subscription-canceled.tmpl [new file with mode: 0644] blob
templates/ja/test-page.tmpl [new file with mode: 0644] blob
templates/ja/trailer.tmpl [new file with mode: 0644] blob
templates/ja/users.tmpl [new file with mode: 0644] blob
test/ipptool.c diff | blob | blame | history
tools/makesrcdist diff | blob | blame | history
xcode/CUPS.xcodeproj/project.pbxproj diff | blob | blame | history
xcode/config.h diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.