Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Thu, 8 Dec 2011 00:39:10 +0000 (00:39 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Thu, 8 Dec 2011 00:39:10 +0000 (00:39 +0000)
commiteaa2d81474e20f98dc60d3e2356db4ff8f7ce076
tree4d5578831d8c9f99f631e5001dd80fe6afd0639e
parent629a8d03ce6aa49f6bb98c2cfc66896f27da09ea
parente7b3305f706dabc62b2d7128a4480014c89b8727
Merge remote-tracking branch 'origin/master' into 0.11

Conflicts:
gst/gstindexfactory.c
libs/gst/base/gstbasetransform.c
plugins/elements/gstfakesink.c
plugins/elements/gstfakesrc.c
plugins/elements/gstidentity.c
plugins/elements/gstinputselector.c
plugins/elements/gstoutputselector.c

Note: did not merge any of the basetransform changes from 0.10.
libs/gst/base/gstbaseparse.c
libs/gst/check/gstcheck.h
plugins/elements/gstfakesink.c
plugins/elements/gstfakesrc.c
plugins/elements/gstidentity.c
plugins/elements/gstinputselector.c
plugins/elements/gstoutputselector.c
tests/check/elements/selector.c