]> granicus.if.org Git - libvpx/commitdiff
Merge branch 'master' into nextgenv2
authorYaowu Xu <yaowu@google.com>
Sat, 31 Oct 2015 12:00:04 +0000 (05:00 -0700)
committerYaowu Xu <yaowu@google.com>
Sat, 31 Oct 2015 12:00:04 +0000 (05:00 -0700)

Trivial merge