projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 49fc424 232a651)
Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 15 Aug 2011 12:43:14 +0000 (14:43 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 15 Aug 2011 12:43:14 +0000 (14:43 +0200)
1  2 
gst/gstdebugutils.c patch | diff1 | diff2 | blob | history
plugins/elements/gstqueue2.c patch | diff1 | diff2 | blob | history

diff --cc gst/gstdebugutils.c
Simple merge
diff --cc plugins/elements/gstqueue2.c
Simple merge
Domain: Multimedia / Media Common;