Merge changes from CUPS 1.5svn-r9400
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Fri, 3 Dec 2010 06:58:01 +0000 (06:58 +0000)
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Fri, 3 Dec 2010 06:58:01 +0000 (06:58 +0000)
commit229681c188bf1940a4963a5796df4be65bb00825
tree9d3cc08c6a2c46fdae6b42f8536acfd2d49da543
parent0837b7e828b9fc312fcf8f5741d2ba9683742672
Merge changes from CUPS 1.5svn-r9400

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@2890 a1ca3aef-8c08-0410-bb20-df032aa958be
23 files changed:
CHANGES-1.4.txt
CHANGES.txt
Makefile
backend/snmp-supplies.c
conf/cupsd.conf.in
config-scripts/cups-common.m4
config-scripts/cups-defaults.m4
config.h.in
cups/http-support.c
cups/http.h
doc/help/ref-cupsd-conf.html.in
filter/bannertops.c
filter/pstext.c
filter/pstops.c
filter/texttops.c
locale/Makefile
man/cupsd.conf.man.in
scheduler/client.c
scheduler/conf.c
scheduler/conf.h
scheduler/ipp.c
scheduler/job.c
systemv/lpstat.c