Merge changes from 1.4svn-r7067.
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Fri, 9 Nov 2007 19:55:26 +0000 (19:55 +0000)
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Fri, 9 Nov 2007 19:55:26 +0000 (19:55 +0000)
commita41f09e265d6451d22585430ca176ff406d59f9b
tree89fa6eb852cf19733a12a04bfefdc3f1f0871519
parente94d2f10682cd1585af76941ea2203f21e9d9955
Merge changes from 1.4svn-r7067.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@533 a1ca3aef-8c08-0410-bb20-df032aa958be
25 files changed:
CHANGES-1.3.txt
Makefile
backend/ipp.c
backend/lpd.c
cups/Makefile
cups/auth.c
cups/encode.c
cups/ipp.c
cups/ipp.h
cups/language.c
doc/help/ref-cupsd-conf.html.in
doc/help/spec-ppd.html
filter/pstops.c
init/Localizable.strings
init/PrintingServices
init/PrintingServices.launchd
init/StartupParameters.plist
packaging/cups.list.in
packaging/cups.spec.in
scheduler/conf.c
scheduler/ipp.c
scheduler/main.c
scheduler/sysman.c
systemv/lpadmin.c
tools/testosx