]> git.ipfire.org Git - thirdparty/cups.git/commit - config.h.in
projects / thirdparty / cups.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 0fa6c7f) | patch
Merge changes from CUPS 1.7svn-r10814.
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Mon, 14 Jan 2013 22:10:30 +0000 (22:10 +0000)
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Mon, 14 Jan 2013 22:10:30 +0000 (22:10 +0000)
commit0cb67df36975d4467f5247a561e4c3e04da41dc2
treeca364c2bc4db236c01ffa20e8490a11e87983ee2tree | snapshot
parent0fa6c7fa54164ee70ee9ccfa936b889a637d5ecdcommit | diff
Merge changes from CUPS 1.7svn-r10814.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@4125 a1ca3aef-8c08-0410-bb20-df032aa958be
232 files changed:
CHANGES-1.6.txt diff | blob | blame | history
INSTALL.txt diff | blob | blame | history
README.txt diff | blob | blame | history
backend/usb-libusb.c diff | blob | blame | history
config.h.in diff | blob | blame | history
cups/cups-private.h diff | blob | blame | history
cups/dest.c diff | blob | blame | history
cups/globals.c diff | blob | blame | history
cups/ipp.c diff | blob | blame | history
cups/usersys.c diff | blob | blame | history
cups/util.c diff | blob | blame | history
desktop/cups.desktop.in diff | blob | blame | history
doc/cs/index.html.in [new file with mode: 0644] blob
doc/fr/index.html.in [new file with mode: 0644] blob
doc/help/man-ipptool.html diff | blob | blame | history
doc/ru/index.html.in [new file with mode: 0644] blob
locale/cups_ca.po diff | blob | blame | history
locale/cups_cs.po [new file with mode: 0644] blob
locale/cups_fr.po [new file with mode: 0644] blob
locale/cups_ru.po [new file with mode: 0644] blob
man/cupsctl.man diff | blob | blame | history
templates/cs/add-class.tmpl [new file with mode: 0644] blob
templates/cs/add-printer.tmpl [new file with mode: 0644] blob
templates/cs/add-rss-subscription.tmpl [new file with mode: 0644] blob
templates/cs/admin.tmpl [new file with mode: 0644] blob
templates/cs/choose-device.tmpl [new file with mode: 0644] blob
templates/cs/choose-make.tmpl [new file with mode: 0644] blob
templates/cs/choose-model.tmpl [new file with mode: 0644] blob
templates/cs/choose-serial.tmpl [new file with mode: 0644] blob
templates/cs/choose-uri.tmpl [new file with mode: 0644] blob
templates/cs/class-added.tmpl [new file with mode: 0644] blob
templates/cs/class-confirm.tmpl [new file with mode: 0644] blob
templates/cs/class-deleted.tmpl [new file with mode: 0644] blob
templates/cs/class-jobs-header.tmpl [new file with mode: 0644] blob
templates/cs/class-modified.tmpl [new file with mode: 0644] blob
templates/cs/class.tmpl [new file with mode: 0644] blob
templates/cs/classes-header.tmpl [new file with mode: 0644] blob
templates/cs/classes.tmpl [new file with mode: 0644] blob
templates/cs/command.tmpl [new file with mode: 0644] blob
templates/cs/edit-config.tmpl [new file with mode: 0644] blob
templates/cs/error-op.tmpl [new file with mode: 0644] blob
templates/cs/error.tmpl [new file with mode: 0644] blob
templates/cs/header.tmpl.in [new file with mode: 0644] blob
templates/cs/help-header.tmpl [new file with mode: 0644] blob
templates/cs/help-printable.tmpl [new file with mode: 0644] blob
templates/cs/help-trailer.tmpl [new file with mode: 0644] blob
templates/cs/job-cancel.tmpl [new file with mode: 0644] blob
templates/cs/job-hold.tmpl [new file with mode: 0644] blob
templates/cs/job-move.tmpl [new file with mode: 0644] blob
templates/cs/job-moved.tmpl [new file with mode: 0644] blob
templates/cs/job-release.tmpl [new file with mode: 0644] blob
templates/cs/job-restart.tmpl [new file with mode: 0644] blob
templates/cs/jobs-header.tmpl [new file with mode: 0644] blob
templates/cs/jobs.tmpl [new file with mode: 0644] blob
templates/cs/list-available-printers.tmpl [new file with mode: 0644] blob
templates/cs/modify-class.tmpl [new file with mode: 0644] blob
templates/cs/modify-printer.tmpl [new file with mode: 0644] blob
templates/cs/norestart.tmpl [new file with mode: 0644] blob
templates/cs/option-boolean.tmpl [new file with mode: 0644] blob
templates/cs/option-conflict.tmpl [new file with mode: 0644] blob
templates/cs/option-header.tmpl [new file with mode: 0644] blob
templates/cs/option-pickmany.tmpl [new file with mode: 0644] blob
templates/cs/option-pickone.tmpl [new file with mode: 0644] blob
templates/cs/option-trailer.tmpl [new file with mode: 0644] blob
templates/cs/pager.tmpl [new file with mode: 0644] blob
templates/cs/printer-accept.tmpl [new file with mode: 0644] blob
templates/cs/printer-added.tmpl [new file with mode: 0644] blob
templates/cs/printer-configured.tmpl [new file with mode: 0644] blob
templates/cs/printer-confirm.tmpl [new file with mode: 0644] blob
templates/cs/printer-default.tmpl [new file with mode: 0644] blob
templates/cs/printer-deleted.tmpl [new file with mode: 0644] blob
templates/cs/printer-jobs-header.tmpl [new file with mode: 0644] blob
templates/cs/printer-modified.tmpl [new file with mode: 0644] blob
templates/cs/printer-purge.tmpl [new file with mode: 0644] blob
templates/cs/printer-reject.tmpl [new file with mode: 0644] blob
templates/cs/printer-start.tmpl [new file with mode: 0644] blob
templates/cs/printer-stop.tmpl [new file with mode: 0644] blob
templates/cs/printer.tmpl [new file with mode: 0644] blob
templates/cs/printers-header.tmpl [new file with mode: 0644] blob
templates/cs/printers.tmpl [new file with mode: 0644] blob
templates/cs/restart.tmpl [new file with mode: 0644] blob
templates/cs/samba-export.tmpl [new file with mode: 0644] blob
templates/cs/samba-exported.tmpl [new file with mode: 0644] blob
templates/cs/search.tmpl [new file with mode: 0644] blob
templates/cs/set-printer-options-header.tmpl [new file with mode: 0644] blob
templates/cs/set-printer-options-trailer.tmpl [new file with mode: 0644] blob
templates/cs/subscription-added.tmpl [new file with mode: 0644] blob
templates/cs/subscription-canceled.tmpl [new file with mode: 0644] blob
templates/cs/test-page.tmpl [new file with mode: 0644] blob
templates/cs/trailer.tmpl [new file with mode: 0644] blob
templates/cs/users.tmpl [new file with mode: 0644] blob
templates/fr/add-class.tmpl [new file with mode: 0644] blob
templates/fr/add-printer.tmpl [new file with mode: 0644] blob
templates/fr/add-rss-subscription.tmpl [new file with mode: 0644] blob
templates/fr/admin.tmpl [new file with mode: 0644] blob
templates/fr/choose-device.tmpl [new file with mode: 0644] blob
templates/fr/choose-make.tmpl [new file with mode: 0644] blob
templates/fr/choose-model.tmpl [new file with mode: 0644] blob
templates/fr/choose-serial.tmpl [new file with mode: 0644] blob
templates/fr/choose-uri.tmpl [new file with mode: 0644] blob
templates/fr/class-added.tmpl [new file with mode: 0644] blob
templates/fr/class-confirm.tmpl [new file with mode: 0644] blob
templates/fr/class-deleted.tmpl [new file with mode: 0644] blob
templates/fr/class-jobs-header.tmpl [new file with mode: 0644] blob
templates/fr/class-modified.tmpl [new file with mode: 0644] blob
templates/fr/class.tmpl [new file with mode: 0644] blob
templates/fr/classes-header.tmpl [new file with mode: 0644] blob
templates/fr/classes.tmpl [new file with mode: 0644] blob
templates/fr/command.tmpl [new file with mode: 0644] blob
templates/fr/edit-config.tmpl [new file with mode: 0644] blob
templates/fr/error-op.tmpl [new file with mode: 0644] blob
templates/fr/error.tmpl [new file with mode: 0644] blob
templates/fr/header.tmpl.in [new file with mode: 0644] blob
templates/fr/help-header.tmpl [new file with mode: 0644] blob
templates/fr/help-printable.tmpl [new file with mode: 0644] blob
templates/fr/help-trailer.tmpl [new file with mode: 0644] blob
templates/fr/job-cancel.tmpl [new file with mode: 0644] blob
templates/fr/job-hold.tmpl [new file with mode: 0644] blob
templates/fr/job-move.tmpl [new file with mode: 0644] blob
templates/fr/job-moved.tmpl [new file with mode: 0644] blob
templates/fr/job-release.tmpl [new file with mode: 0644] blob
templates/fr/job-restart.tmpl [new file with mode: 0644] blob
templates/fr/jobs-header.tmpl [new file with mode: 0644] blob
templates/fr/jobs.tmpl [new file with mode: 0644] blob
templates/fr/list-available-printers.tmpl [new file with mode: 0644] blob
templates/fr/modify-class.tmpl [new file with mode: 0644] blob
templates/fr/modify-printer.tmpl [new file with mode: 0644] blob
templates/fr/norestart.tmpl [new file with mode: 0644] blob
templates/fr/option-boolean.tmpl [new file with mode: 0644] blob
templates/fr/option-conflict.tmpl [new file with mode: 0644] blob
templates/fr/option-header.tmpl [new file with mode: 0644] blob
templates/fr/option-pickmany.tmpl [new file with mode: 0644] blob
templates/fr/option-pickone.tmpl [new file with mode: 0644] blob
templates/fr/option-trailer.tmpl [new file with mode: 0644] blob
templates/fr/pager.tmpl [new file with mode: 0644] blob
templates/fr/printer-accept.tmpl [new file with mode: 0644] blob
templates/fr/printer-added.tmpl [new file with mode: 0644] blob
templates/fr/printer-configured.tmpl [new file with mode: 0644] blob
templates/fr/printer-confirm.tmpl [new file with mode: 0644] blob
templates/fr/printer-default.tmpl [new file with mode: 0644] blob
templates/fr/printer-deleted.tmpl [new file with mode: 0644] blob
templates/fr/printer-jobs-header.tmpl [new file with mode: 0644] blob
templates/fr/printer-modified.tmpl [new file with mode: 0644] blob
templates/fr/printer-purge.tmpl [new file with mode: 0644] blob
templates/fr/printer-reject.tmpl [new file with mode: 0644] blob
templates/fr/printer-start.tmpl [new file with mode: 0644] blob
templates/fr/printer-stop.tmpl [new file with mode: 0644] blob
templates/fr/printer.tmpl [new file with mode: 0644] blob
templates/fr/printers-header.tmpl [new file with mode: 0644] blob
templates/fr/printers.tmpl [new file with mode: 0644] blob
templates/fr/restart.tmpl [new file with mode: 0644] blob
templates/fr/samba-export.tmpl [new file with mode: 0644] blob
templates/fr/samba-exported.tmpl [new file with mode: 0644] blob
templates/fr/search.tmpl [new file with mode: 0644] blob
templates/fr/set-printer-options-header.tmpl [new file with mode: 0644] blob
templates/fr/set-printer-options-trailer.tmpl [new file with mode: 0644] blob
templates/fr/subscription-added.tmpl [new file with mode: 0644] blob
templates/fr/subscription-canceled.tmpl [new file with mode: 0644] blob
templates/fr/test-page.tmpl [new file with mode: 0644] blob
templates/fr/trailer.tmpl [new file with mode: 0644] blob
templates/fr/users.tmpl [new file with mode: 0644] blob
templates/ru/add-class.tmpl [new file with mode: 0644] blob
templates/ru/add-printer.tmpl [new file with mode: 0644] blob
templates/ru/add-rss-subscription.tmpl [new file with mode: 0644] blob
templates/ru/admin.tmpl [new file with mode: 0644] blob
templates/ru/choose-device.tmpl [new file with mode: 0644] blob
templates/ru/choose-make.tmpl [new file with mode: 0644] blob
templates/ru/choose-model.tmpl [new file with mode: 0644] blob
templates/ru/choose-serial.tmpl [new file with mode: 0644] blob
templates/ru/choose-uri.tmpl [new file with mode: 0644] blob
templates/ru/class-added.tmpl [new file with mode: 0644] blob
templates/ru/class-confirm.tmpl [new file with mode: 0644] blob
templates/ru/class-deleted.tmpl [new file with mode: 0644] blob
templates/ru/class-jobs-header.tmpl [new file with mode: 0644] blob
templates/ru/class-modified.tmpl [new file with mode: 0644] blob
templates/ru/class.tmpl [new file with mode: 0644] blob
templates/ru/classes-header.tmpl [new file with mode: 0644] blob
templates/ru/classes.tmpl [new file with mode: 0644] blob
templates/ru/command.tmpl [new file with mode: 0644] blob
templates/ru/edit-config.tmpl [new file with mode: 0644] blob
templates/ru/error-op.tmpl [new file with mode: 0644] blob
templates/ru/error.tmpl [new file with mode: 0644] blob
templates/ru/header.tmpl.in [new file with mode: 0644] blob
templates/ru/help-header.tmpl [new file with mode: 0644] blob
templates/ru/help-printable.tmpl [new file with mode: 0644] blob
templates/ru/help-trailer.tmpl [new file with mode: 0644] blob
templates/ru/job-cancel.tmpl [new file with mode: 0644] blob
templates/ru/job-hold.tmpl [new file with mode: 0644] blob
templates/ru/job-move.tmpl [new file with mode: 0644] blob
templates/ru/job-moved.tmpl [new file with mode: 0644] blob
templates/ru/job-release.tmpl [new file with mode: 0644] blob
templates/ru/job-restart.tmpl [new file with mode: 0644] blob
templates/ru/jobs-header.tmpl [new file with mode: 0644] blob
templates/ru/jobs.tmpl [new file with mode: 0644] blob
templates/ru/list-available-printers.tmpl [new file with mode: 0644] blob
templates/ru/modify-class.tmpl [new file with mode: 0644] blob
templates/ru/modify-printer.tmpl [new file with mode: 0644] blob
templates/ru/norestart.tmpl [new file with mode: 0644] blob
templates/ru/option-boolean.tmpl [new file with mode: 0644] blob
templates/ru/option-conflict.tmpl [new file with mode: 0644] blob
templates/ru/option-header.tmpl [new file with mode: 0644] blob
templates/ru/option-pickmany.tmpl [new file with mode: 0644] blob
templates/ru/option-pickone.tmpl [new file with mode: 0644] blob
templates/ru/option-trailer.tmpl [new file with mode: 0644] blob
templates/ru/pager.tmpl [new file with mode: 0644] blob
templates/ru/printer-accept.tmpl [new file with mode: 0644] blob
templates/ru/printer-added.tmpl [new file with mode: 0644] blob
templates/ru/printer-configured.tmpl [new file with mode: 0644] blob
templates/ru/printer-confirm.tmpl [new file with mode: 0644] blob
templates/ru/printer-default.tmpl [new file with mode: 0644] blob
templates/ru/printer-deleted.tmpl [new file with mode: 0644] blob
templates/ru/printer-jobs-header.tmpl [new file with mode: 0644] blob
templates/ru/printer-modified.tmpl [new file with mode: 0644] blob
templates/ru/printer-purge.tmpl [new file with mode: 0644] blob
templates/ru/printer-reject.tmpl [new file with mode: 0644] blob
templates/ru/printer-start.tmpl [new file with mode: 0644] blob
templates/ru/printer-stop.tmpl [new file with mode: 0644] blob
templates/ru/printer.tmpl [new file with mode: 0644] blob
templates/ru/printers-header.tmpl [new file with mode: 0644] blob
templates/ru/printers.tmpl [new file with mode: 0644] blob
templates/ru/restart.tmpl [new file with mode: 0644] blob
templates/ru/samba-export.tmpl [new file with mode: 0644] blob
templates/ru/samba-exported.tmpl [new file with mode: 0644] blob
templates/ru/search.tmpl [new file with mode: 0644] blob
templates/ru/set-printer-options-header.tmpl [new file with mode: 0644] blob
templates/ru/set-printer-options-trailer.tmpl [new file with mode: 0644] blob
templates/ru/subscription-added.tmpl [new file with mode: 0644] blob
templates/ru/subscription-canceled.tmpl [new file with mode: 0644] blob
templates/ru/test-page.tmpl [new file with mode: 0644] blob
templates/ru/trailer.tmpl [new file with mode: 0644] blob
templates/ru/users.tmpl [new file with mode: 0644] blob
test/ipptool.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.