]> granicus.if.org Git - libvpx/commitdiff
Merge remote branch 'origin/master' into experimental
authorJohn Koleszar <jkoleszar@google.com>
Thu, 28 Jul 2011 04:05:12 +0000 (00:05 -0400)
committerJohn Koleszar <jkoleszar@google.com>
Thu, 28 Jul 2011 04:05:12 +0000 (00:05 -0400)
Change-Id: Iaca87acc9726b5173d638528684d154538ec01e6

1  2 
vp8/encoder/rdopt.c

Simple merge