]> granicus.if.org Git - libvpx/commit
Merge remote branch 'internal/upstream' into HEAD
authorJohn Koleszar <jkoleszar@google.com>
Fri, 21 Jan 2011 15:14:46 +0000 (10:14 -0500)
committerJohn Koleszar <jkoleszar@google.com>
Fri, 21 Jan 2011 15:14:46 +0000 (10:14 -0500)
commitb6aee6ffab4f0b3e9eac2f14329998d6ac2a19d4
tree77ca2dcc2cdd9452f5d543b7a04b72898ae8a980
parent46d9ff1b97ce32ccf6908648203532c4d5de050d
parent8064583d2621a159b01508c1fd0017c4e7887938
Merge remote branch 'internal/upstream' into HEAD

Conflicts:
configure

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