]> git.ipfire.org Git - thirdparty/cups.git/commit - notifier/Makefile
Merge changes from CUPS 1.7svn-r10755.
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Wed, 12 Dec 2012 20:54:21 +0000 (20:54 +0000)
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Wed, 12 Dec 2012 20:54:21 +0000 (20:54 +0000)
commitc1420c8744235de1249c34b956b7c11ccafd659d
tree27879336dd313e589eb2004964f2af416520daff
parentc41769ffd04ad45bb2c95691ad3999674896a2ed
Merge changes from CUPS 1.7svn-r10755.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@4074 a1ca3aef-8c08-0410-bb20-df032aa958be
40 files changed:
CHANGES-1.6.txt
backend/Makefile
backend/dnssd.c
backend/snmp-supplies.c
berkeley/Makefile
conf/Makefile
conf/cups-files.conf.in
config-scripts/cups-opsys.m4
config-scripts/cups-ssl.m4
cups/Makefile
cups/cups-private.h
cups/dest.c
cups/globals.c
cups/http-addr.c
cups/http-private.h
cups/http-support.c
cups/http.c
cups/http.h
cups/ipp.c
cups/ipp.h
cups/ppd-cache.c
cups/ppd-private.h
cups/pwg-media.c
cups/util.c
cups/versioning.h
doc/Makefile
doc/help/man-ipptoolfile.html
locale/cups_ca.po
locale/cups_es.po
locale/cups_ja.po
man/cupsctl.man
man/ipptoolfile.man
man/ppdcfile.man
notifier/Makefile
systemv/Makefile
systemv/cupstestppd.c
test/Makefile
test/ippserver.c
test/ipptool.c
test/run-stp-tests.sh