]> git.ipfire.org Git - thirdparty/cups.git/commit - locale/cups.strings
Merge changes from CUPS 1.5svn-r9631.
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Sun, 20 Mar 2011 21:48:45 +0000 (21:48 +0000)
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Sun, 20 Mar 2011 21:48:45 +0000 (21:48 +0000)
commit82f972324ddde683be8a6d302f9937532ab0cf81
treed7490373e1fedb1f9d7eeecb030a8379bb4292b5
parent31db8dedac44900657d4ef431ace56de8b9009d3
Merge changes from CUPS 1.5svn-r9631.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3062 a1ca3aef-8c08-0410-bb20-df032aa958be
35 files changed:
CHANGES-1.4.txt
CHANGES.txt
backend/ipp.c
backend/usb-darwin.c
config-scripts/cups-common.m4
config-scripts/cups-defaults.m4
config-scripts/cups-ssl.m4
config.h.in
cups/file.c
cups/http-addr.c
cups/http-addrlist.c
cups/http.c
cups/language.c
cups/ppd-cache.c
cups/ppd-private.h
doc/help/api-cups.html
doc/help/api-filter.html
doc/help/api-ppd.html
doc/help/spec-ppd.html
filter/spec-ppd.shtml
locale/cups.pot
locale/cups.strings
scheduler/auth.c
scheduler/classes.c
scheduler/cupsd.h
scheduler/dirsvc.c
scheduler/ipp.c
scheduler/job.c
scheduler/main.c
scheduler/printers.c
scheduler/printers.h
scheduler/process.c
systemv/cupsctl.c
xcode/CUPS.xcodeproj/project.pbxproj [new file with mode: 0644]
xcode/config.h [new file with mode: 0644]