]> granicus.if.org Git - libvpx/commit
Merge remote branch 'origin/master' into experimental
authorJohn Koleszar <jkoleszar@google.com>
Tue, 21 Dec 2010 12:54:10 +0000 (07:54 -0500)
committerJohn Koleszar <jkoleszar@google.com>
Tue, 21 Dec 2010 12:54:10 +0000 (07:54 -0500)
commit0b710c8d1a4d60f49032a44def013dd6babecd13
tree70e5973a651042b00d51a7a3100212e57c084c3c
parenteee331e7f3185b57a3c64d97b999422925064f49
parent6cb708d50162ea4d6337949bc75587e87cac51eb
Merge remote branch 'origin/master' into experimental

Conflicts:
vp8/vp8_cx_iface.c

Change-Id: I76f302448f11b28772efd4b5643f86a7cc69a8c2
vp8/vp8_cx_iface.c
vpx/vp8cx.h