projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2243adf
11ac49e
)
Merge branch 'master' into 0.11
author
Sebastian Dröge
<sebastian.droege@collabora.co.uk>
Tue, 3 May 2011 07:41:48 +0000
(09:41 +0200)
committer
Sebastian Dröge
<sebastian.droege@collabora.co.uk>
Tue, 3 May 2011 07:42:58 +0000
(09:42 +0200)
Conflicts:
configure.ac
gst/gstbus.c
Trivial merge