]> granicus.if.org Git - libvpx/commitdiff
Merge branch 'master' into nextgenv2
authorYaowu Xu <yaowu@google.com>
Mon, 26 Oct 2015 15:57:30 +0000 (08:57 -0700)
committerYaowu Xu <yaowu@google.com>
Mon, 26 Oct 2015 15:57:30 +0000 (08:57 -0700)

Trivial merge