projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9c044ac 6c290ab)
Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Fri, 4 Nov 2011 10:02:32 +0000 (11:02 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Fri, 4 Nov 2011 10:02:32 +0000 (11:02 +0100)
Conflicts:
configure.ac


Trivial merge
Domain: Multimedia / Media Common;