Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Wed, 2 Mar 2011 10:08:34 +0000 (11:08 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Wed, 2 Mar 2011 10:08:34 +0000 (11:08 +0100)
Conflicts:
gst/gstregistry.h

1  2 
configure.ac
docs/gst/gstreamer-sections.txt
gst/gstutils.c
plugins/elements/gstfilesrc.c
tests/check/Makefile.am
tools/gst-inspect.c
tools/gst-launch.c
win32/common/libgstreamer.def

diff --cc configure.ac
Simple merge
Simple merge
diff --cc gst/gstutils.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge