gst-plugins-bad: fix git merge breakage
authorFelix Domke <felix.domke@multimedia-labs.de>
Thu, 10 Sep 2009 16:11:57 +0000 (18:11 +0200)
committerFelix Domke <felix.domke@multimedia-labs.de>
Thu, 10 Sep 2009 16:11:57 +0000 (18:11 +0200)
commit2992f11abf66df379dde5fa793c0d36fc7fb1310
treefbbe52a941e19fbb8cd71c8dd24f8c0bce413cf5
parent3b1e6e131f37cf563060e62439f7cd03a97ab3a7
gst-plugins-bad: fix git merge breakage
packages/gstreamer/gst-plugins-bad_0.10.14.bb