From: James Zern <jzern@google.com>
Date: Wed, 30 Sep 2015 19:55:36 +0000 (+0000)
Subject: Merge "test/*.h: (windows) fix min/max conflict"
X-Git-Tag: v1.5.0~99
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cd6d56e9a651db3a6497efe16daf5f09c34cf5cd;p=libvpx

Merge "test/*.h: (windows) fix min/max conflict"
---

cd6d56e9a651db3a6497efe16daf5f09c34cf5cd