projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3fab57b 7d3858a)
Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 22 Aug 2011 11:14:49 +0000 (13:14 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 22 Aug 2011 11:14:49 +0000 (13:14 +0200)
Conflicts:
ext/pango/gsttextoverlay.c


Trivial merge
Domain: Multimedia / Media Common;