Merge remote branch 'origin/master' into experimental
authorJohn Koleszar <jkoleszar@google.com>
Fri, 5 Nov 2010 16:30:33 +0000 (12:30 -0400)
committerJohn Koleszar <jkoleszar@google.com>
Fri, 5 Nov 2010 16:30:33 +0000 (12:30 -0400)
commit7a590c902b9a77d9792d3a2497d28302eb0e0834
treeb1f735eee5d5a6fbc633b11eecf90dc47f8d7e42
parentf4020e2338a1786b1db0f67075ceb7d9c01be6a3
parent5551ef0ef4fd3271330fa5a2fbdfe70d4d2a1d2e
Merge remote branch 'origin/master' into experimental

Conflicts:
configure
ivfenc.c
vp8/common/alloccommon.c
vp8/common/onyxc_int.h
vp8/vp8_cx_iface.c
configure
vp8/common/alloccommon.c
vp8/common/onyxc_int.h
vp8/vp8_cx_iface.c
vpx/vp8cx.h