projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d339093 d0e9588)
Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Fri, 20 May 2011 14:03:10 +0000 (16:03 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Fri, 20 May 2011 14:03:10 +0000 (16:03 +0200)
Conflicts:
gst/gstpad.h
gst/gstplugin.h


Trivial merge
Domain: Multimedia / Media Common;