]> granicus.if.org Git - libvpx/commitdiff
Merge "Resolve merge issues with --enable-pvq" into nextgenv2
authorYaowu Xu <yaowu@google.com>
Mon, 7 Nov 2016 20:31:33 +0000 (20:31 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Mon, 7 Nov 2016 20:31:33 +0000 (20:31 +0000)

Trivial merge