From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Fri, 17 Jun 2011 13:48:19 +0000 (+0200)
Subject: Merge branch 'master' into 0.11
X-Git-Tag: RELEASE-0.11.0~95
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6b60a27aba71f9f745c0ce3a9bbf0c06df38ee20;p=platform%2Fupstream%2Fgst-plugins-base.git

Merge branch 'master' into 0.11

Conflicts:
	tests/examples/Makefile.am
---

6b60a27aba71f9f745c0ce3a9bbf0c06df38ee20
diff --cc tests/examples/Makefile.am
index 0d6cd0e,14795db..317f851
--- a/tests/examples/Makefile.am
+++ b/tests/examples/Makefile.am
@@@ -8,8 -8,8 +8,8 @@@ if USE_GI
  GIO_SUBDIRS = gio
  endif
  
 -SUBDIRS = app audio dynamic $(FT2_SUBDIRS) $(GIO_SUBDIRS) overlay playrec volume v4l encoding
 +SUBDIRS = app audio dynamic $(FT2_SUBDIRS) $(GIO_SUBDIRS) overlay playrec volume encoding
  
- DIST_SUBDIRS = app dynamic gio overlay seek snapshot playrec volume encoding
 -DIST_SUBDIRS = app audio dynamic gio overlay seek snapshot playrec volume v4l encoding
++DIST_SUBDIRS = app audio dynamic gio overlay seek snapshot playrec volume encoding
  
  include $(top_srcdir)/common/parallel-subdirs.mak