projects / platform / upstream / gst-plugins-ugly.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bd30919 895b887)
Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Fri, 2 Dec 2011 02:01:06 +0000 (02:01 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Fri, 2 Dec 2011 02:01:06 +0000 (02:01 +0000)
Conflicts:
ext/dvdread/dvdreadsrc.c


Trivial merge
Domain: Multimedia / Media Common;