Merge remote branch 'origin/master' into experimental
authorJohn Koleszar <jkoleszar@google.com>
Fri, 20 May 2011 12:33:51 +0000 (08:33 -0400)
committerJohn Koleszar <jkoleszar@google.com>
Fri, 20 May 2011 12:33:51 +0000 (08:33 -0400)
commit54bc4fde77f0c3ed42907d3c86ecc51cf8cddc80
treefc5e50da5e0823be3e58d72773efe267b553c998
parenta741e0e3cb63e3e4b398c8c275fd909836ec8074
parent1f3f18443db5820157448515579c14efd19eea1b
Merge remote branch 'origin/master' into experimental

Conflicts:
configure

Change-Id: I91b9059e5b724a96368c7765c147fdf5a5ce03f2
configure
vp8/common/alloccommon.c
vp8/common/generic/systemdependent.c
vp8/common/onyxc_int.h
vp8/decoder/onyxd_int.h
vp8/encoder/encodeframe.c
vp8/encoder/generic/csystemdependent.c
vp8/encoder/onyx_if.c
vp8/encoder/rdopt.c