]> granicus.if.org Git - libvpx/commitdiff
projects / libvpx / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bdd8966 2eccbd0)
Merge "Fix build error caused by a merge conflict."
authorYaowu Xu <yaowu@google.com>
Fri, 14 Feb 2014 03:03:13 +0000 (19:03 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Fri, 14 Feb 2014 03:03:13 +0000 (19:03 -0800)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.