Merge "*.mk: s/\bUSE_X86INC/CONFIG_USE_X86INC/"

author James Zern <jzern@google.com>

Mon, 10 Feb 2014 23:39:28 +0000 (15:39 -0800)

committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org>

Mon, 10 Feb 2014 23:39:28 +0000 (15:39 -0800)
author James Zern <jzern@google.com>
Mon, 10 Feb 2014 23:39:28 +0000 (15:39 -0800)
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
Mon, 10 Feb 2014 23:39:28 +0000 (15:39 -0800)
diff --cc vp9/vp9_common.mk
Simple merge
diff --cc vp9/vp9cx.mk
Simple merge
author	James Zern <jzern@google.com>
	Mon, 10 Feb 2014 23:39:28 +0000 (15:39 -0800)
committer	Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
	Mon, 10 Feb 2014 23:39:28 +0000 (15:39 -0800)
		1	2
vp9/vp9_common.mk	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/vp9cx.mk	patch \|	diff1 \|	diff2 \|	blob \| history