projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 59d5ad4 ee93a0c)
Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 12 Dec 2011 12:40:17 +0000 (12:40 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 12 Dec 2011 12:40:17 +0000 (12:40 +0000)
Conflicts:
gst-plugins-base.spec.in
po/LINGUAS
po/cs.po
po/eo.po
po/es.po
po/gl.po
po/lv.po
po/sr.po


Trivial merge
Domain: Multimedia / Media Common;