projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8cd2408 2e7b2d8)
Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Fri, 13 Jan 2012 00:01:01 +0000 (00:01 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Fri, 13 Jan 2012 00:01:01 +0000 (00:01 +0000)
Conflicts:
ext/a52dec/gsta52dec.c


Trivial merge
Domain: Multimedia / Media Common;