projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 76b7ff8 629d734)
Merge branch 'master' into 0.11
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Fri, 27 Jan 2012 14:12:25 +0000 (15:12 +0100)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Fri, 27 Jan 2012 14:12:25 +0000 (15:12 +0100)
Conflicts:
gst/adder/gstadder.c


Trivial merge
Domain: Multimedia / Media Common;