projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d93129d 4af771a)
Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Fri, 17 Jun 2011 13:48:19 +0000 (15:48 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Fri, 17 Jun 2011 13:48:19 +0000 (15:48 +0200)
Conflicts:
tests/examples/Makefile.am

1  2 
gst-plugins-base.spec.in patch | diff1 | diff2 | blob | history
tests/examples/Makefile.am patch | diff1 | diff2 | blob | history

diff --cc gst-plugins-base.spec.in
Simple merge
diff --cc tests/examples/Makefile.am
index 0d6cd0e,14795db..317f851
--- 1/tests/examples/Makefile.am
--- 2/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
Domain: Multimedia / Media Common;