[0.11] gstreamer: Merge branch 'master' into 0.11

Sebastian Dröge slomo at kemper.freedesktop.org
Fri Jan 27 06:09:44 PST 2012


Module: gstreamer
Branch: 0.11
Commit: 753a1125dd24373212a7c052942f78675b68bbe0
URL:    http://cgit.freedesktop.org/gstreamer/gstreamer/commit/?id=753a1125dd24373212a7c052942f78675b68bbe0

Author: Sebastian Dröge <sebastian.droege at collabora.co.uk>
Date:   Fri Jan 27 15:09:35 2012 +0100

Merge branch 'master' into 0.11

Conflicts:
	libs/gst/base/gstcollectpads2.c
	libs/gst/base/gstcollectpads2.h

---





More information about the gstreamer-commits mailing list