projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9b94fc3 c603bf9)
Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Fri, 28 Oct 2011 09:46:40 +0000 (11:46 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Fri, 28 Oct 2011 09:46:40 +0000 (11:46 +0200)
Conflicts:
gst/videomixer/gstcollectpads2.c


Trivial merge
Domain: Multimedia / Media Common;