]> granicus.if.org Git - libvpx/commit
Merge remote branch 'origin/master' into experimental
authorJohn Koleszar <jkoleszar@google.com>
Fri, 21 Jan 2011 15:11:12 +0000 (10:11 -0500)
committerJohn Koleszar <jkoleszar@google.com>
Fri, 21 Jan 2011 15:11:51 +0000 (10:11 -0500)
commitcbe07a749120a48e827c881cbdf9a649a32e25b8
treede6692ce673cc0af10e2e2e14e120946edeecf68
parent3ac80a74f80452a5212c0680e678be6ab7541bed
parent8064583d2621a159b01508c1fd0017c4e7887938
Merge remote branch 'origin/master' into experimental

Conflicts:
configure

Change-Id: I87cdc3faac79e683038fa4a45c3ac542b8e931a5
configure
vp8/encoder/firstpass.c
vp8/encoder/onyx_if.c