Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 28 Feb 2011 10:47:44 +0000 (11:47 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 28 Feb 2011 10:47:44 +0000 (11:47 +0100)
commitc6dd11981d5932c34e587295b574945e9d47426e
tree9beddd383591387231048c7843a2ae0ec71beeb9
parentf22687bacc04136fae5c934b16395d90c9fa357c
parentfa300aee2006b1771c7dd77c8cfd5730296ab5f1
Merge branch 'master' into 0.11

Conflicts:
configure.ac
gst-libs/gst/pbutils/Makefile.am
18 files changed:
configure.ac
ext/ogg/gstoggdemux.c
gst-libs/gst/app/Makefile.am
gst-libs/gst/audio/Makefile.am
gst-libs/gst/cdda/Makefile.am
gst-libs/gst/fft/Makefile.am
gst-libs/gst/interfaces/Makefile.am
gst-libs/gst/netbuffer/Makefile.am
gst-libs/gst/pbutils/Makefile.am
gst-libs/gst/riff/Makefile.am
gst-libs/gst/rtp/Makefile.am
gst-libs/gst/rtsp/Makefile.am
gst-libs/gst/sdp/Makefile.am
gst-libs/gst/tag/Makefile.am
gst-libs/gst/video/Makefile.am
gst/playback/gstdecodebin2.c
gst/tcp/gstmultifdsink.c
gst/tcp/gstmultifdsink.h