Merge branch 'master' into 0.11
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Thu, 26 May 2011 11:47:24 +0000 (13:47 +0200)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Thu, 26 May 2011 11:54:09 +0000 (13:54 +0200)
commitbf08ca70200bee15b3acf6c55a5df4ddba87ef8e
tree5cc923d5da8ffee85c62c1880a93d1fbb05b00e9
parente614c6bd8161ab1fd36c84619ae49aa14102f51c
parent7716358d045d90f43aecd7136a29c31f6ce75bdf
Merge branch 'master' into 0.11
16 files changed:
configure.ac
ext/gnomevfs/gstgnomevfssrc.c
ext/pango/gstbasetextoverlay.c
ext/pango/gstbasetextoverlay.h
ext/pango/gsttextrender.c
ext/theora/gsttheoraenc.c
gst-libs/gst/riff/riff-read.c
gst-libs/gst/tag/gstexiftag.c
gst/audiotestsrc/gstaudiotestsrc.c
gst/playback/gstplaybin2.c
gst/volume/gstvolume.c
sys/ximage/ximagepool.c
sys/ximage/ximagesink.c
sys/xvimage/xvimagepool.c
sys/xvimage/xvimagesink.c
tests/examples/seek/seek.c