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

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

Simple merge
Simple merge