Merge branch 'master' of https://github.com/apple/cups

author Michael R Sweet <michael.r.sweet@gmail.com>

Thu, 16 May 2019 02:24:48 +0000 (22:24 -0400)

committer Michael R Sweet <michael.r.sweet@gmail.com>

Thu, 16 May 2019 02:24:48 +0000 (22:24 -0400)
author Michael R Sweet <michael.r.sweet@gmail.com>
Thu, 16 May 2019 02:24:48 +0000 (22:24 -0400)
committer Michael R Sweet <michael.r.sweet@gmail.com>
Thu, 16 May 2019 02:24:48 +0000 (22:24 -0400)
diff --cc vcnet/ippeveprinter.vcxproj
Simple merge
diff --cc vcnet/ippfind.vcxproj
Simple merge
diff --cc vcnet/ipptool.vcxproj
Simple merge
author	Michael R Sweet <michael.r.sweet@gmail.com>
	Thu, 16 May 2019 02:24:48 +0000 (22:24 -0400)
committer	Michael R Sweet <michael.r.sweet@gmail.com>
	Thu, 16 May 2019 02:24:48 +0000 (22:24 -0400)
		1	2
vcnet/ippeveprinter.vcxproj	patch \|	diff1 \|	diff2 \|	blob \| history
vcnet/ippfind.vcxproj	patch \|	diff1 \|	diff2 \|	blob \| history
vcnet/ipptool.vcxproj	patch \|	diff1 \|	diff2 \|	blob \| history