Merge "vpx_integer.h: fix incorrect type emulation"
authorJohn Koleszar <jkoleszar@google.com>
Tue, 13 Dec 2011 20:55:46 +0000 (12:55 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Tue, 13 Dec 2011 20:55:46 +0000 (12:55 -0800)

Trivial merge