projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6cf9c89 40af7a9)
Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 28 Apr 2011 17:28:16 +0000 (19:28 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 28 Apr 2011 17:28:16 +0000 (19:28 +0200)
Conflicts:
configure.ac


Trivial merge
Domain: Multimedia / Media Common;