]> granicus.if.org Git - libvpx/commitdiff
Merge changes I05b3028a,I1ad41c09
authorJames Zern <jzern@google.com>
Thu, 5 May 2016 01:23:19 +0000 (01:23 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 5 May 2016 01:23:20 +0000 (01:23 +0000)
* changes:
  vpx_dsp_common.h: remove circular include
  vpx_dsp_common.h: fix include guard


Trivial merge