]> granicus.if.org Git - libvpx/commitdiff
Merge remote branch 'origin/master' into experimental
authorJohn Koleszar <jkoleszar@google.com>
Fri, 11 Feb 2011 05:05:12 +0000 (00:05 -0500)
committerJohn Koleszar <jkoleszar@google.com>
Fri, 11 Feb 2011 05:05:14 +0000 (00:05 -0500)
Change-Id: Icf1a7c61a3b07da2ccfd94bca9e8810c01e46b2c

1  2 
vp8/encoder/onyx_if.c
vp8/encoder/rdopt.c

Simple merge
Simple merge