]> git.ipfire.org Git - thirdparty/cups.git/commit
Merge changes from r6758 to r6781.
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Thu, 9 Aug 2007 16:35:06 +0000 (16:35 +0000)
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Thu, 9 Aug 2007 16:35:06 +0000 (16:35 +0000)
commit7ff4fea9bc80dfaaa12179a72dd34210cad13061
tree645259a14a8127496de27f4df1e4db45ea4e7c0f
parentc24d21342fd8b3bb674364f52d01c6c4181d8ee2
Merge changes from r6758 to r6781.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@388 a1ca3aef-8c08-0410-bb20-df032aa958be
50 files changed:
CHANGES.txt
INSTALL.txt
README.txt
backend/Makefile
backend/ipp.c
conf/mime.convs.in
cups/auth.c
doc/help/options.html
filter/pstops.c
locale/cups_da.po
locale/cups_de.po
locale/cups_es.po
locale/cups_fi.po
locale/cups_fr.po
locale/cups_it.po
locale/cups_nl.po [new file with mode: 0644]
locale/cups_no.po
locale/cups_pl.po
locale/cups_pt_BR.po [new file with mode: 0644]
locale/cups_pt_PT.po
locale/cups_ru.po
locale/cups_sv.po
packaging/cups.list.in
packaging/cups.spec.in
ppd/deskjet.ppd
ppd/dymo.ppd
ppd/epson24.ppd
ppd/epson9.ppd
ppd/intelbar.ppd
ppd/laserjet.ppd
ppd/okidat24.ppd
ppd/okidata9.ppd
ppd/sample.drv
ppd/stcolor.ppd
ppd/stcolor2.ppd
ppd/stphoto.ppd
ppd/stphoto2.ppd
ppd/zebra.ppd
ppd/zebracpl.ppd
ppd/zebraep1.ppd
ppd/zebraep2.ppd
scheduler/auth.c
scheduler/auth.h
scheduler/client.c
scheduler/conf.c
scheduler/cups-driverd.c
scheduler/cups-lpd.c
scheduler/ipp.c
scheduler/job.c
scheduler/main.c