projects / platform / upstream / gst-plugins-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5e8fd1b 2488107)
Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Wed, 9 Nov 2011 11:19:04 +0000 (12:19 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Wed, 9 Nov 2011 11:19:04 +0000 (12:19 +0100)
Conflicts:
gst/colorspace/colorspace.c


Trivial merge
Domain: Multimedia / Media Common;