From: John Koleszar <jkoleszar@google.com>
Date: Thu, 11 Nov 2010 14:25:10 +0000 (-0500)
Subject: Merge remote branch 'origin/master' into experimental
X-Git-Tag: v1.3.0~1217^2~556
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f225211256d6df95db5063e98abaa97d5b355170;p=libvpx

Merge remote branch 'origin/master' into experimental

Conflicts:
	configure

Change-Id: Ifa63e4610657f75cb953aa7ca08f997267612cc0
---

f225211256d6df95db5063e98abaa97d5b355170
diff --cc configure
index ab86fa01c,f32fffe38..748e69880
--- a/configure
+++ b/configure
@@@ -252,9 -251,7 +253,10 @@@ CONFIG_LIST=
      shared
      small
      arm_asm_detok
+     postproc_visualizer
 +
 +    experimental
 +    ${EXPERIMENT_LIST}
  "
  CMDLINE_SELECT="
      extra_warnings