From: John Koleszar <jkoleszar@google.com>
Date: Fri, 20 May 2011 12:33:51 +0000 (-0400)
Subject: Merge remote branch 'origin/master' into experimental
X-Git-Tag: v1.3.0~1217^2~443
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=54bc4fde77f0c3ed42907d3c86ecc51cf8cddc80;p=libvpx

Merge remote branch 'origin/master' into experimental

Conflicts:
	configure

Change-Id: I91b9059e5b724a96368c7765c147fdf5a5ce03f2
---

54bc4fde77f0c3ed42907d3c86ecc51cf8cddc80
diff --cc configure
index bbe58069a,7596d1124..86f2791aa
--- a/configure
+++ b/configure
@@@ -299,6 -295,6 +301,8 @@@ CMDLINE_SELECT=
      shared
      small
      postproc_visualizer
++
++    experimental
  "
  
  process_cmdline() {