projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 987109f 12e5e2b)
Merge remote-tracking branch 'keema/master'
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Mon, 11 Jun 2012 11:38:01 +0000 (13:38 +0200)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Mon, 11 Jun 2012 11:38:01 +0000 (13:38 +0200)
Conflicts:
gst-sdk/tutorials/basic-tutorial-12.c


Trivial merge
Domain: Multimedia / Media Common;