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

1  2 
vp8/vp8_cx_iface.c

Simple merge