]> granicus.if.org Git - libvpx/commit
Merge "Resolve configuration conflict"
authorYaowu Xu <yaowu@google.com>
Tue, 21 Apr 2015 15:00:49 +0000 (08:00 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Tue, 21 Apr 2015 15:00:49 +0000 (08:00 -0700)
commit924d06a0755fdbdd90883f3fcc16b837f00362d1
tree238f64fbf07ce214cff3e8d4e1baf8c3d3a960e3
parent391ecffed91200a5c48f0388ce494d70cc86fc37
parentb423a6b21293e2609268b3f430d3dedec0b68b3f
Merge "Resolve configuration conflict"