Merge changes from CUPS trunk, r7566.
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Thu, 15 May 2008 01:42:36 +0000 (01:42 +0000)
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Thu, 15 May 2008 01:42:36 +0000 (01:42 +0000)
commitc9fc04c6ec14cb5073b49491ab90551183743b4d
tree2b1b03cd31fd7dd3f26e9dcadb40cc7c2f0a16cf
parent969307f09661cc4884f54b3e5742b9768516d2a0
Merge changes from CUPS trunk, r7566.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@761 a1ca3aef-8c08-0410-bb20-df032aa958be
44 files changed:
CHANGES.txt
Makefile
backend/Makefile
backend/mdns.c
backend/network.c
berkeley/Makefile
cgi-bin/Makefile
conf/Makefile
cups/Makefile
cups/file.c
cups/http-support.c
cups/language.c
cups/localize.c
cups/testfile.c
cups/testhttp.c
cups/testppd.c
cups/transcode.c
data/Makefile
doc/Makefile
doc/cups.css
doc/index.html.in
driver/Makefile
filter/Makefile
fonts/Makefile
locale/Makefile
man/Makefile
man/filter.man
monitor/Makefile
notifier/Makefile
ppdc/Makefile
scheduler/Makefile
scheduler/auth.c
scheduler/conf.h
scheduler/ipp.c
scheduler/job.c
scheduler/printers.c
scheduler/printers.h
scheduler/statbuf.c
scripting/php/Makefile
standards/Makefile
systemv/Makefile
templates/Makefile
templates/header.tmpl.in
test/Makefile