From: James Zern <jzern@google.com>
Date: Wed, 25 Jun 2014 21:26:18 +0000 (-0700)
Subject: Merge changes I915beaef,I229dd6ca
X-Git-Tag: v1.4.0~1334
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ce7199075e551871052de49121905277721062a5;p=libvpx

Merge changes I915beaef,I229dd6ca

* changes:
  vp9cx.mk: move avx c files outside of x86inc block
  test.mk: remove renamed file
---

ce7199075e551871052de49121905277721062a5