Merge branch 'master' into 0.11
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Thu, 8 Sep 2011 12:23:50 +0000 (14:23 +0200)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Thu, 8 Sep 2011 12:28:23 +0000 (14:28 +0200)
commit43538e2e75b4bdc5fc71a62b472a4b223472c059
tree8fc77f478b9d15166c85c083e24d0ee0e6b890ad
parenta952de69dd7aa216dc7aaf5572ae17229574477a
parentd3cad28da936b037d877dc70c02286b81b680284
Merge branch 'master' into 0.11

Conflicts:
docs/design/draft-buffer2.txt
docs/design/part-TODO.txt
docs/design/part-block.txt
docs/design/part-bufferlist.txt
docs/design/part-caps.txt
docs/design/part-element-transform.txt
docs/design/part-events.txt
docs/design/part-negotiation.txt
gst/gstcaps.c
gst/gstevent.h
gst/gstghostpad.c
gst/gstinterface.c
gst/gstpad.c
gst/gstpad.h
gst/gstutils.c
libs/gst/base/gstbasesink.c
libs/gst/base/gstbasesrc.c
libs/gst/base/gstbasetransform.c
libs/gst/base/gsttypefindhelper.c
plugins/elements/gstcapsfilter.c
plugins/elements/gsttee.c
tests/check/generic/sinks.c
tools/gst-launch.1.in
42 files changed:
docs/design/part-TODO.txt
docs/design/part-block.txt
docs/design/part-caps.txt
docs/design/part-element-transform.txt
docs/design/part-events.txt
docs/design/part-gstelement.txt
docs/design/part-latency.txt
docs/design/part-messages.txt
docs/design/part-scheduling.txt
docs/design/part-seeking.txt
docs/manual/highlevel-components.xml
gst/gstbin.c
gst/gstcaps.c
gst/gstelement.c
gst/gstevent.c
gst/gstghostpad.c
gst/gstpad.c
gst/gstpad.h
gst/gstpipeline.c
gst/gstplugin.c
gst/gstpluginfeature.c
gst/gstpluginfeature.h
gst/gstpoll.c
gst/gstregistry.c
gst/gstsegment.h
gst/gststructure.c
gst/gstutils.c
gst/gstutils.h
gst/gstvalue.c
libs/gst/base/gstbasesink.c
libs/gst/base/gstbasesrc.c
libs/gst/base/gstbasetransform.c
libs/gst/base/gsttypefindhelper.c
libs/gst/controller/gstcontroller.c
plugins/elements/gstidentity.c
plugins/elements/gstmultiqueue.c
plugins/elements/gstqueue2.c
plugins/elements/gsttee.c
tests/check/elements/filesink.c
tests/check/generic/sinks.c
tests/check/gst/gstelementfactory.c
tests/check/gst/gstevent.c