]> granicus.if.org Git - libvpx/commitdiff
Merge branch 'master' into nextgenv2
authorYaowu Xu <yaowu@google.com>
Sat, 19 Dec 2015 13:00:06 +0000 (05:00 -0800)
committerYaowu Xu <yaowu@google.com>
Sat, 19 Dec 2015 13:00:06 +0000 (05:00 -0800)

Trivial merge