]> git.ipfire.org Git - thirdparty/cups.git/commit
Merge changes from CUPS 1.7svn-r10643
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Mon, 15 Oct 2012 21:02:10 +0000 (21:02 +0000)
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Mon, 15 Oct 2012 21:02:10 +0000 (21:02 +0000)
commit3dd9c340583c44d4dcb7223efbd0a815e0027ff7
treeb152c85430602eae72e9d9ae80d27fbba715f4f5
parent5a9febac19255ab8aea598449ea63bda730b2fe0
Merge changes from CUPS 1.7svn-r10643

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3940 a1ca3aef-8c08-0410-bb20-df032aa958be
36 files changed:
CHANGES-1.6.txt
CHANGES.txt
Makefile
backend/ipp.c
backend/snmp.c
backend/usb-unix.c
config-scripts/cups-compiler.m4
config-scripts/cups-directories.m4
config-scripts/cups-manpages.m4
config-scripts/cups-opsys.m4
config-scripts/cups-sharedlibs.m4
cups/http-addr.c
cups/http-private.h
cups/http.h
doc/help/network.html
doc/help/ref-cupsd-conf.html.in
doc/help/spec-cmp.html
filter/rastertolabel.c
packaging/cups.list.in
ppdc/ppdc-driver.cxx
scheduler/conf.c
scheduler/conf.h
scheduler/cups.sh.in
scheduler/dirsvc.c
scheduler/main.c
scheduler/printers.c
scheduler/select.c
systemv/lpstat.c
templates/ca/header.tmpl.in
templates/ca/trailer.tmpl
templates/es/header.tmpl.in
templates/es/trailer.tmpl
templates/header.tmpl.in
templates/ja/header.tmpl.in
templates/ja/trailer.tmpl
templates/trailer.tmpl