]> git.ipfire.org Git - thirdparty/cups.git/commit - cups/http.c
Merge changes from CUPS 1.5svn-r9525
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Fri, 11 Feb 2011 21:20:35 +0000 (21:20 +0000)
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Fri, 11 Feb 2011 21:20:35 +0000 (21:20 +0000)
commite60ec91f3e2a38a90f17ee193db32f5c6bef27ed
tree944c85f063ab91bc0cb837f0acef521e704f5ec2
parent515b46cde4f06006e9e33cac6a9a717d6fb3bd50
Merge changes from CUPS 1.5svn-r9525

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@2975 a1ca3aef-8c08-0410-bb20-df032aa958be
24 files changed:
CHANGES-1.4.txt
CHANGES.txt
Makedefs.in
backend/ipp.c
cgi-bin/admin.c
cups/conflicts.c
cups/http-private.h
cups/http.c
cups/language.c
cups/request.c
filter/image-zoom.c
notifier/mailto.c
notifier/testnotify.c
scheduler/client.c
scheduler/dirsvc.c
scheduler/ipp.c
scheduler/main.c
scheduler/printers.c
scheduler/process.c
scheduler/server.c
scheduler/sysman.c
test/Makefile
test/ippserver.c
test/ipptool.c