Merge branch 'master' into 0.11
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Mon, 16 May 2011 14:53:04 +0000 (16:53 +0200)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Mon, 16 May 2011 14:53:04 +0000 (16:53 +0200)
commitb935a814d949f71b1d5968d3f87ce365381fdb95
tree09e08df568b875051908b43b36ac5bc698974bce
parent6bff1f968a61a32141f27cfda20e25c0af24cfd7
parentfe1dcbe6fa1625ae83980f4da813f0f3764e7d51
Merge branch 'master' into 0.11

Conflicts:
configure.ac
docs/gst/gstreamer-sections.txt
gst/gstbin.c
gst/gstelement.c
gst/gstelement.h
gst/gstghostpad.c
gst/gstminiobject.c
gst/gstminiobject.h
libs/gst/base/gstbasesrc.c
libs/gst/base/gstbasetransform.c
plugins/elements/gstinputselector.c
tests/check/gst/gstminiobject.c
19 files changed:
configure.ac
docs/gst/gstreamer-sections.txt
docs/plugins/gstreamer-plugins.args
gst/gst_private.h
gst/gstbin.c
gst/gstelement.c
gst/gstelement.h
gst/gstghostpad.c
gst/gstghostpad.h
gst/gstminiobject.c
gst/gstminiobject.h
gst/gstsystemclock.c
libs/gst/base/gstbasesrc.c
plugins/elements/gstinputselector.c
plugins/elements/gstmultiqueue.c
plugins/elements/gstqueue2.c
tests/check/gst/gstghostpad.c
tests/check/gst/gstminiobject.c
win32/common/libgstreamer.def