Merge "Make it possible to change the number of remote jobs"

author Shinichiro Hamaji <hamaji@google.com>

Fri, 25 Sep 2015 04:34:37 +0000 (04:34 +0000)

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

Fri, 25 Sep 2015 04:34:37 +0000 (04:34 +0000)
author Shinichiro Hamaji <hamaji@google.com>
Fri, 25 Sep 2015 04:34:37 +0000 (04:34 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 25 Sep 2015 04:34:37 +0000 (04:34 +0000)
diff --cc core/goma.mk
Simple merge
diff --cc core/ninja.mk
Simple merge
author	Shinichiro Hamaji <hamaji@google.com>
	Fri, 25 Sep 2015 04:34:37 +0000 (04:34 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Fri, 25 Sep 2015 04:34:37 +0000 (04:34 +0000)
		1	2
core/goma.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/ninja.mk	patch \|	diff1 \|	diff2 \|	blob \| history