Merge changes from CUPS 1.4svn-r7932.
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Wed, 10 Sep 2008 22:30:50 +0000 (22:30 +0000)
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Wed, 10 Sep 2008 22:30:50 +0000 (22:30 +0000)
commit49d8745278805ede5c41bae3c299e14ba40457bf
tree875bed78b8cff9d470bff3bf1feffcd8fdb4e869
parentc5571a1d68de6e20e127c9745aa7a4dbf4e4474d
Merge changes from CUPS 1.4svn-r7932.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@957 a1ca3aef-8c08-0410-bb20-df032aa958be
40 files changed:
CHANGES-1.3.txt
CHANGES.txt
Makefile
backend/Dependencies
backend/Makefile
config-scripts/cups-defaults.m4
config-scripts/cups-network.m4
config-scripts/cups-scripting.m4
config.h.in
cups/Dependencies
cups/globals.h
cups/http-addr.c
cups/http-addrlist.c
desktop/cups.desktop.in
doc/Makefile
doc/help/ref-cupsd-conf.html.in
locale/translate.c
man/Makefile
man/cupsaccept.man [moved from man/accept.man with 94% similarity]
man/cupsd.conf.man.in
man/lpstat.man
notifier/Dependencies
notifier/Makefile
notifier/dbus.c
packaging/cups.list.in
scheduler/client.c
scheduler/conf.c
scheduler/conf.h
scheduler/cupsd.h
scheduler/dirsvc.c
scheduler/ipp.c
scheduler/listen.c
scheduler/log.c
scheduler/main.c
scheduler/server.c
scheduler/sysman.c
scheduler/sysman.h
systemv/Makefile
systemv/accept.c
systemv/lpstat.c