Merge branch 'master' into 0.11
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Sat, 16 Apr 2011 14:06:26 +0000 (16:06 +0200)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Sat, 16 Apr 2011 14:06:26 +0000 (16:06 +0200)
commitc8792778f8fa6d376a8905f3f559cc13ce08bf47
treea143b421e06e8bedf5f9ed73b16e21d3f57c7078
parent92d10cbb8c17ba3b03fc6e9aa541f6a1f123c664
parent55e767b6328e6cc0db7bf6ac23cdf4e0eab537e6
Merge branch 'master' into 0.11
ext/ogg/gstoggmux.c
ext/ogg/gstoggstream.c
gst-libs/gst/app/Makefile.am