Merge "Use KATI_DEPFILE for .P associated with object files"

author Shinichiro Hamaji <hamaji@google.com>

Mon, 14 Mar 2016 21:59:46 +0000 (21:59 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Mon, 14 Mar 2016 21:59:46 +0000 (21:59 +0000)
author Shinichiro Hamaji <hamaji@google.com>
Mon, 14 Mar 2016 21:59:46 +0000 (21:59 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Mon, 14 Mar 2016 21:59:46 +0000 (21:59 +0000)
diff --cc core/binary.mk
Simple merge
diff --cc core/definitions.mk
Simple merge
diff --cc core/ninja.mk
Simple merge
author	Shinichiro Hamaji <hamaji@google.com>
	Mon, 14 Mar 2016 21:59:46 +0000 (21:59 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Mon, 14 Mar 2016 21:59:46 +0000 (21:59 +0000)
		1	2
core/binary.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/definitions.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/ninja.mk	patch \|	diff1 \|	diff2 \|	blob \| history