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

projects / platform / upstream / gstreamer.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 355dbdf 38dcd41)

author	Wim Taymans <wim.taymans@collabora.co.uk>
	Tue, 19 Apr 2011 14:21:15 +0000 (16:21 +0200)
committer	Wim Taymans <wim.taymans@collabora.co.uk>
	Tue, 19 Apr 2011 14:21:15 +0000 (16:21 +0200)
commit	24bb41403559929eb9d4c8d663420a1972388e9e
tree	3cc68397487e35b3df65a8ed26e2812400e8093c	tree \| snapshot
parent	355dbdfa7e1e49187d5bb4034461265b24dfa61c	commit \| diff
parent	38dcd41b9717396142848969960ff9edc723accc	commit \| diff

Merge branch 'master' into 0.11

Conflicts:
configure.ac

gst/gstquery.c	diff1 \|	diff2 \|	blob \| history
gst/gstquery.h	diff1 \|	diff2 \|	blob \| history
libs/gst/base/gstbaseparse.c	diff1 \|	diff2 \|	blob \| history
libs/gst/base/gstbasetransform.c	diff1 \|	diff2 \|	blob \| history
tools/gst-launch.c	diff1 \|	diff2 \|	blob \| history

Domain: Multimedia / Media Common;