]> granicus.if.org Git - libvpx/commit
Merge remote branch 'origin/master' into experimental
authorJohn Koleszar <jkoleszar@google.com>
Wed, 15 Dec 2010 13:08:18 +0000 (08:08 -0500)
committerJohn Koleszar <jkoleszar@google.com>
Wed, 15 Dec 2010 13:08:18 +0000 (08:08 -0500)
commit4fa8d36f760904c1ad6c8e64597ab2afc8340d11
tree63898a5882a416eb8dd0f4ffad9da6cc39aca5ad
parent6a80032280305c41f20403b07698ca969ec7edb2
parent3ac73173a4c7e5be0a9846bc323699e7365c60ee
Merge remote branch 'origin/master' into experimental

Conflicts:
vp8/common/entropy.c

Change-Id: I35fd49cf92a50d09082fe199d3bf21bfca68a94f
vp8/common/entropy.c
vp8/common/entropy.h