]> git.ipfire.org Git - thirdparty/cups.git/commit - cups/testconflicts.c
Import changes from CUPS 1.5svn-r9085.
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Wed, 7 Apr 2010 07:11:03 +0000 (07:11 +0000)
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Wed, 7 Apr 2010 07:11:03 +0000 (07:11 +0000)
commitaaf19ab07e5ba1f270e4ebbc321a1a0b76a4d25f
treeb11eb70a9cb3704ab33bb96db46f8d553aeeadf8
parente2d18a01cc1e81e6ab17e318c56e0c356801783d
Import changes from CUPS 1.5svn-r9085.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@2046 a1ca3aef-8c08-0410-bb20-df032aa958be
74 files changed:
CHANGES.txt
backend/Dependencies
backend/pap.c
berkeley/Dependencies
cgi-bin/Dependencies
cgi-bin/admin.c
conf/cupsd.conf.in
cups/Dependencies
cups/adminutil.h
cups/cups-private.h
cups/cups.h
cups/http.c
cups/ipp-private.h
cups/ipp-support.c
cups/ipp.c
cups/ipp.h
cups/ppd-private.h
cups/ppd.h
cups/pwg-media.c
cups/pwg-ppd.c
cups/pwg-private.h
cups/raster.h
cups/testconflicts.c
cups/testcups.c
cups/testipp.c
cups/testpwg.c
cups/versioning.h
doc/Makefile
doc/help/api-cgi.html
doc/help/api-cups.html
doc/help/api-httpipp.html
doc/help/api-ppd.html
doc/help/whatsnew.html
driver/Dependencies
filter/Dependencies
filter/commandtops.c
filter/common.h
filter/imagetops.c
filter/imagetoraster.c
filter/pdftops.c
filter/rastertohp.c
filter/rastertolabel.c
locale/Dependencies
man/Makefile
man/ipptest.man [deleted file]
man/ipptool.man [new file with mode: 0644]
man/ipptoolfile.man [moved from man/ipp.test.man with 89% similarity]
monitor/Dependencies
monitor/bcp.c
monitor/tbcp.c
notifier/Dependencies
packaging/cups.list.in
packaging/cups.spec.in
ppdc/Dependencies
scheduler/Dependencies
scheduler/conf.c
scheduler/ipp.c
scheduler/printers.c
scripting/php/Dependencies
standards/rfctohtml.c
systemv/Dependencies
test/Dependencies
test/Makefile
test/create-printer-subscription.test
test/get-completed-jobs.test [new file with mode: 0644]
test/get-jobs.test
test/ipp-1.1.test
test/ipp-2.0.test
test/ipp-2.1.test
test/ipptool.c [moved from test/ipptest.c with 88% similarity]
test/run-stp-tests.sh
vc2005/ipptool.vcproj [moved from vc2005/ipptest.vcproj with 93% similarity]
vcnet/cups.sln
vcnet/ipptool.vcproj [moved from vcnet/ipptest.vcproj with 93% similarity]