projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7e5aeba 711e6a1)
Merge branch 'master' into 0.11
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Wed, 25 Jan 2012 11:29:11 +0000 (12:29 +0100)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Wed, 25 Jan 2012 11:29:11 +0000 (12:29 +0100)
Conflicts:
gst/playback/gstdecodebin2.c

1  2 
gst/playback/gstdecodebin2.c patch | diff1 | diff2 | blob | history

diff --cc gst/playback/gstdecodebin2.c
Simple merge
Domain: Multimedia / Media Common;