]> git.ipfire.org Git - thirdparty/cups.git/commit
Merge changes from CUPS 1.5svn-r9037.
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Thu, 11 Mar 2010 06:44:46 +0000 (06:44 +0000)
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Thu, 11 Mar 2010 06:44:46 +0000 (06:44 +0000)
commitba55dc12de9ef3103d220a332ad7d26c54e397fa
treec02b6f7c42126c87cbeb9738903bddad7483dd45
parent5a6b583acf40fd75a0eacaf886c6127fc122e516
Merge changes from CUPS 1.5svn-r9037.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1968 a1ca3aef-8c08-0410-bb20-df032aa958be
27 files changed:
CHANGES-1.4.txt
CHANGES.txt
cups/adminutil.c
cups/adminutil.h
cups/dest.c
cups/getdevices.c
cups/ipp.c
cups/libcups_s.exp
cups/mark.c
cups/request.c
cups/util.c
filter/pstops.c
man/cupsfilter.man
scheduler/conf.c
scheduler/conf.h
scheduler/cupsd.h
scheduler/cupsfilter.c
scheduler/ipp.c
scheduler/job.c
scheduler/log.c
scheduler/main.c
scheduler/network.c
scheduler/policy.c
scheduler/printers.c
scheduler/quotas.c
systemv/cupstestppd.c
test/run-stp-tests.sh