[0.11] gst-plugins-good: eqMerge remote-tracking branch 'origin/master' into 0.11

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


Module: gst-plugins-good
Branch: 0.11
Commit: 8580dd86c9e73a523cc2a78f10541b330598fa6a
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-good/commit/?id=8580dd86c9e73a523cc2a78f10541b330598fa6a

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

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

Conflicts:
	ext/jack/gstjackaudiosink.c
	ext/jack/gstjackaudiosrc.c
	gst/matroska/matroska-mux.c
	gst/matroska/matroska-read-common.c
	gst/rtpmanager/gstrtpssrcdemux.c

---





More information about the gstreamer-commits mailing list