Merge remote branch 'origin/master' into experimental
authorJohn Koleszar <jkoleszar@google.com>
Thu, 11 Nov 2010 14:25:10 +0000 (09:25 -0500)
committerJohn Koleszar <jkoleszar@google.com>
Thu, 11 Nov 2010 14:25:10 +0000 (09:25 -0500)
commitf225211256d6df95db5063e98abaa97d5b355170
tree4799ce0ca21fd704c7d2ba64b8bb7e5ae274f3d5
parent3a99784b5e4695bd99a50f412fec22169fe7b1fa
parent692b10858d8be54706f3e02ba3075c9718d7d683
Merge remote branch 'origin/master' into experimental

Conflicts:
configure

Change-Id: Ifa63e4610657f75cb953aa7ca08f997267612cc0
configure
vp8/vp8_cx_iface.c