Merge branch 'master' into experimental
authorJohn Koleszar <jkoleszar@google.com>
Tue, 11 Jun 2013 23:29:08 +0000 (16:29 -0700)
committerJohn Koleszar <jkoleszar@google.com>
Tue, 11 Jun 2013 23:29:28 +0000 (16:29 -0700)
commitd0ed677a34d4778d96ee4c31d04e153b52f14394
treeff2a9c10f996a4b65a98583fe0f87a17c0c728ea
parent76e0c95dd93d6ecddb43969a3124e70d3a4c2dbc
parenta43bdcd7b021d7aa091a516ac313930b3d28fe6e
Merge branch 'master' into experimental

Change-Id: Ie648398b82f7311143709f55c0e30ba452f50eff
build/make/Makefile
build/make/configure.sh
configure
vp8/encoder/onyx_if.c
vp9/vp9_dx_iface.c
vpxdec.c