projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
987109f
12e5e2b
)
Merge remote-tracking branch 'keema/master'
author
Sebastian Dröge
<sebastian.droege@collabora.co.uk>
Mon, 11 Jun 2012 11:38:01 +0000
(13:38 +0200)
committer
Sebastian 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