Merge "vpx_ports/x86.h: de-dup #elif block"
authorJohn Koleszar <jkoleszar@google.com>
Tue, 18 Jun 2013 15:26:54 +0000 (08:26 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Tue, 18 Jun 2013 15:26:54 +0000 (08:26 -0700)

Trivial merge