]> granicus.if.org Git - libvpx/commitdiff
Merge remote branch 'origin/master' into experimental
authorJohn Koleszar <jkoleszar@google.com>
Tue, 18 Jan 2011 05:05:16 +0000 (00:05 -0500)
committerJohn Koleszar <jkoleszar@google.com>
Tue, 18 Jan 2011 05:05:17 +0000 (00:05 -0500)
Change-Id: I3e51945a61446e1ee70caaf97ff7cf0c740bf1da

1  2 
vp8/vp8_cx_iface.c

Simple merge