projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
compact
(merge:
43538e2
7a82ed4
)
Merge branch 'master' into 0.11
author
Sebastian Dröge
<sebastian.droege@collabora.co.uk>
Thu, 8 Sep 2011 12:30:07 +0000
(14:30 +0200)
committer
Sebastian Dröge
<sebastian.droege@collabora.co.uk>
Thu, 8 Sep 2011 12:30:07 +0000
(14:30 +0200)
Conflicts:
gst/gstpad.c
Trivial merge