projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: df5af9c 30b2aba)
Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 17 May 2011 07:31:01 +0000 (09:31 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 17 May 2011 07:31:01 +0000 (09:31 +0200)
1  2 
ext/cdparanoia/gstcdparanoiasrc.c patch | diff1 | diff2 | blob | history

diff --cc ext/cdparanoia/gstcdparanoiasrc.c
Simple merge
Domain: Multimedia / Media Common;