diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-04-26 08:28:51 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-04-26 08:28:51 -0400 |
| commit | 0a77e59847967f76f022e3d8eacef302f4a16038 (patch) | |
| tree | 226aad9ddfa0d2d7bba975a6b009ae83b06b9f60 /mainpage.dox | |
| parent | 5227798c570af08d08dd6fdd7a3e96d5dc96977b (diff) | |
| parent | d5c46bdfc0d7bcc25e3ff549a0dc03d759050c19 (diff) | |
| download | libvpx-0a77e59847967f76f022e3d8eacef302f4a16038.tar libvpx-0a77e59847967f76f022e3d8eacef302f4a16038.tar.gz libvpx-0a77e59847967f76f022e3d8eacef302f4a16038.tar.bz2 libvpx-0a77e59847967f76f022e3d8eacef302f4a16038.zip | |
Merge remote branch 'origin/master' into experimental
Conflicts:
vp8/common/alloccommon.c
vp8/encoder/rdopt.c
Change-Id: I142167d31d1b9cffe143774f6915bca463df67f0
Diffstat (limited to 'mainpage.dox')
0 files changed, 0 insertions, 0 deletions