Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Sun, 25 Dec 2011 11:58:12 +0000 (11:58 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Sun, 25 Dec 2011 11:58:12 +0000 (11:58 +0000)
commitf6a4af20b2b2b044e5c0b939f97861fc7cca94dd
tree219a20d5bed81391e9d3076e9606c50145d31e82
parente5e4fbeb035d7361273b358ad18f19306d97ba19
parentf2d76b7e7b1af42963e3c252fcce9f5ac7911ce4
Merge remote-tracking branch 'origin/master' into 0.11

Conflicts:
libs/gst/base/gstbasetransform.c
libs/gst/controller/gstinterpolationcontrolsource.c
libs/gst/controller/gstlfocontrolsource.c
plugins/elements/gstfilesrc.c

Dit not merge controller or basetransform changes.
gst/gstpipeline.c
libs/gst/base/gstbaseparse.c
libs/gst/base/gstcollectpads2.c
libs/gst/base/gstcollectpads2.h
plugins/elements/gstfilesrc.c
win32/common/libgstbase.def