Merge changes from CUPS 1.5svn-r9062.
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Tue, 30 Mar 2010 23:24:27 +0000 (23:24 +0000)
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Tue, 30 Mar 2010 23:24:27 +0000 (23:24 +0000)
commit5180a04ce8365f7f3e6156fe7389367aee1de9b7
tree87a48c901558e4bc3083e91aa559fe22c2003090
parent61e2aeb0be5e2aee6fcf7ec3dc1f1ec600f2a316
Merge changes from CUPS 1.5svn-r9062.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@2016 a1ca3aef-8c08-0410-bb20-df032aa958be
16 files changed:
CHANGES-1.4.txt
Makefile
config-scripts/cups-directories.m4
cups/Makefile
cups/cups-private.h
cups/getdevices.c
cups/globals.c
cups/http-private.h
cups/libcups2.def [new file with mode: 0644]
cups/libcups_s.exp
scheduler/cups-lpd.c
scheduler/job.c
scheduler/main.c
test/ipptest.c
vcnet/config.h
vcnet/libcups2.vcproj