Merge remote-tracking branch 'origin/vp9-preview' into experimental
authorJohn Koleszar <jkoleszar@google.com>
Wed, 5 Dec 2012 16:41:35 +0000 (08:41 -0800)
committerJohn Koleszar <jkoleszar@google.com>
Wed, 5 Dec 2012 16:41:35 +0000 (08:41 -0800)
1  2 
libs.mk
vp9/vp9cx.mk

diff --cc libs.mk
Simple merge
diff --cc vp9/vp9cx.mk
Simple merge