[0.11] gst-plugins-base: Merge remote-tracking branch 'origin/master' into 0.11

Tim Müller tpm at kemper.freedesktop.org
Thu Jan 12 16:18:00 PST 2012


Module: gst-plugins-base
Branch: 0.11
Commit: 0461ed2adad12fbf19a605820ceed11f6acb031a
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=0461ed2adad12fbf19a605820ceed11f6acb031a

Author: Tim-Philipp Müller <tim.muller at collabora.co.uk>
Date:   Thu Jan 12 23:21:17 2012 +0000

Merge remote-tracking branch 'origin/master' into 0.11

Conflicts:
	gst-libs/gst/pbutils/gstdiscoverer-types.c
	gst-libs/gst/pbutils/gstdiscoverer.c
	tests/check/Makefile.am

---





More information about the gstreamer-commits mailing list