]> git.ipfire.org Git - thirdparty/cups.git/commit - backend/runloop.c
Merge changes from CUPS 1.4svn-r7670.
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Wed, 18 Jun 2008 16:44:53 +0000 (16:44 +0000)
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Wed, 18 Jun 2008 16:44:53 +0000 (16:44 +0000)
commitdd1abb6b5f145c5e5f279d8848b5f3ec161fd227
tree48d46ed8d33890c2b5d047996f5a61aab8990520
parentc934a06cde0e8f2657b7e614df31fd300658d53e
Merge changes from CUPS 1.4svn-r7670.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@810 a1ca3aef-8c08-0410-bb20-df032aa958be
44 files changed:
CHANGES-1.3.txt
CHANGES.txt
CREDITS.txt
backend/runloop.c
backend/serial.c
conf/Makefile
conf/cupsd.conf.in
conf/mime.types
config-scripts/cups-compiler.m4
config-scripts/cups-defaults.m4
config-scripts/cups-sharedlibs.m4
cups/debug.c
cups/http.c
cups/localize.c
cups/testppd.c
cups/util.c
desktop/cups.desktop
doc/help/ref-cupsd-conf.html.in
doc/help/spec-ppd.html
filter/pstops.c
man/cups-config.man
man/cups-deviced.man.in
man/cups-driverd.man.in
man/cupsd.conf.man.in
man/lpq.man
man/mantohtml.c
man/mime.types.man
packaging/cups.list.in
packaging/cups.spec.in
ppdc/ppdmerge.cxx
scheduler/auth.c
scheduler/conf.c
scheduler/cups-driverd.c
scheduler/cupsfilter.c
scheduler/ipp.c
scheduler/job.c
scheduler/mime.h
scheduler/printers.c
scheduler/testmime.c
scheduler/testspeed.c
scheduler/type.c
systemv/cupstestppd.c
systemv/lpoptions.c
test/run-stp-tests.sh