Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 7 Dec 2010 14:53:56 +0000 (15:53 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 7 Dec 2010 14:53:56 +0000 (15:53 +0100)
commitce0355e6d0e8aaccafb214e17acdbefbdb67a232
tree44d3e32e20e2504a1d3068b310c3b28314ad9d36
parent920ef127cef792df6fbf798917e212095badeba1
parentd1eb8a14c534498fdcbf914333f3c7d03a279ef4
Merge branch 'master' into 0.11
gst/gstplugin.c
libs/gst/base/Makefile.am
libs/gst/check/Makefile.am
libs/gst/net/Makefile.am