Merge branch 'master' into 0.11-fdo
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 28 Mar 2011 18:11:20 +0000 (20:11 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 28 Mar 2011 18:11:20 +0000 (20:11 +0200)
commita12ede3fb13ece05c67bae74729473c04c242493
treee0b54b7af7ccd2b3422f4eb2112cf6aad83761f8
parent121b82ce27e5913dd2ae5a1cba4358de4d769eb0
parentbae67f116c2d3f6a8f6e68386cc31e6a4e0e85db
Merge branch 'master' into 0.11-fdo

Conflicts:
gst/gst.c
libs/gst/base/gstcollectpads.c
21 files changed:
gst/gst.c
gst/gstbin.c
gst/gstcaps.c
gst/gstcaps.h
gst/gstelement.h
gst/gstevent.h
gst/gsttask.h
libs/gst/base/gstbasesink.c
libs/gst/base/gstbasesrc.c
libs/gst/base/gstbasesrc.h
libs/gst/base/gstbasetransform.c
libs/gst/base/gstbasetransform.h
libs/gst/base/gstbytereader.h
libs/gst/base/gstbytewriter.h
libs/gst/base/gstcollectpads.c
plugins/elements/gstfilesrc.c
plugins/elements/gstinputselector.c
plugins/elements/gstmultiqueue.c
plugins/elements/gstqueue2.c
tests/check/Makefile.am
win32/common/libgstreamer.def