Merge remote branch 'origin/master' into experimental
authorJohn Koleszar <jkoleszar@google.com>
Fri, 27 May 2011 04:05:12 +0000 (00:05 -0400)
committerJohn Koleszar <jkoleszar@google.com>
Fri, 27 May 2011 04:05:12 +0000 (00:05 -0400)
commit2fa7fe66c41b85b71d74d14a64bf731673f8bc10
tree7dfc7af9ab905e8756fad5cb1e97a658bf4343fe
parent26fd970b154f77fcc8eabbcf035c18558bb191cb
parent1fe5070b7698957930864502adce0d3c9cceae8d
Merge remote branch 'origin/master' into experimental

Change-Id: I6d6692418eecf54e23e00a08394b0b37d6e7682b
vp8/common/alloccommon.c
vp8/encoder/onyx_if.c