]> git.ipfire.org Git - thirdparty/cups.git/commit - man/cups-files.conf.man.in
Merge changes from CUPS 1.7svn-r10710.
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Mon, 26 Nov 2012 19:37:04 +0000 (19:37 +0000)
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Mon, 26 Nov 2012 19:37:04 +0000 (19:37 +0000)
commitc41769ffd04ad45bb2c95691ad3999674896a2ed
tree550981cc16f46b17c991aaab2a0c520ba1333f86
parenta469f8a57669e1948d5cc29005d8c097312de63a
Merge changes from CUPS 1.7svn-r10710.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@4040 a1ca3aef-8c08-0410-bb20-df032aa958be
30 files changed:
CHANGES-1.6.txt
CHANGES-IPPTOOL.txt
IPPTOOL.txt
backend/ipp.c
conf/Makefile
conf/cups-files.conf.in [new file with mode: 0644]
conf/cupsd.conf.in
config-scripts/cups-defaults.m4
config-scripts/cups-ssl.m4
configure.in
cups/http-addr.c
cups/http-private.h
cups/http.c
cups/versioning.h
doc/Makefile
doc/help/man-ipptoolfile.html
doc/help/ref-cups-files-conf.html.in [new file with mode: 0644]
doc/help/ref-cupsd-conf.html.in
man/Makefile
man/cups-files.conf.man.in [new file with mode: 0644]
man/cupsd.conf.man.in
man/ipptoolfile.man
packaging/cups.list.in
packaging/cups.spec.in
scheduler/client.c
scheduler/conf.c
scheduler/conf.h
scheduler/main.c
test/ipptool.c
test/run-stp-tests.sh