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

1  2 
vp8/common/onyxc_int.h
vp8/encoder/onyx_if.c

Simple merge
Simple merge