review.tizen.org Git - platform/upstream/gstreamer.git/commit

projects / platform / upstream / gstreamer.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: a8cc106 795e836)

author	Wim Taymans <wim.taymans@collabora.co.uk>
	Fri, 4 Nov 2011 18:11:19 +0000 (19:11 +0100)
committer	Wim Taymans <wim.taymans@collabora.co.uk>
	Fri, 4 Nov 2011 18:11:19 +0000 (19:11 +0100)
commit	c2c977602754ca2c471482839deb421925014025
tree	5c8f3d9bc8c725ddeb8308854c06941ad88d4073	tree \| snapshot
parent	a8cc106ba85050dfce7b56b6c70e331c6aba7c8e	commit \| diff
parent	795e836ce3e63b2382be0cb5981f014bb061263e	commit \| diff

Merge branch 'master' into 0.11

Conflicts:
gst/gstbin.c

configure.ac	diff1 \|	diff2 \|	blob \| history
gst/gstbin.c	diff1 \|	diff2 \|	blob \| history
gst/gstclock.h	diff1 \|	diff2 \|	blob \| history
libs/gst/base/gstcollectpads2.h	diff1 \|	diff2 \|	blob \| history
plugins/elements/gstqueue.c	diff1 \|	diff2 \|	blob \| history
plugins/elements/gstqueue2.c	diff1 \|	diff2 \|	blob \| history

Domain: Multimedia / Media Common;