projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f1980aa 9b8992c)
Merge branch 'master' into 0.11
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Fri, 20 May 2011 10:26:57 +0000 (12:26 +0200)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Fri, 20 May 2011 10:26:57 +0000 (12:26 +0200)
Conflicts:
docs/plugins/gst-plugins-base-plugins.hierarchy
docs/plugins/gst-plugins-base-plugins.interfaces
docs/plugins/gst-plugins-base-plugins.prerequisites

1  2 
gst/audioconvert/gstaudioconvert.c patch | diff1 | diff2 | blob | history
gst/encoding/gstencodebin.c patch | diff1 | diff2 | blob | history

diff --cc gst/audioconvert/gstaudioconvert.c
Simple merge
diff --cc gst/encoding/gstencodebin.c
Simple merge
Domain: Multimedia / Media Common;