projects
/
platform
/
upstream
/
gst-plugins-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
abcbef2
d08e695
)
Merge branch 'master' into 0.11
author
Sebastian Dröge
<sebastian.droege@collabora.co.uk>
Tue, 3 May 2011 07:49:26 +0000
(09:49 +0200)
committer
Sebastian Dröge
<sebastian.droege@collabora.co.uk>
Tue, 3 May 2011 07:49:26 +0000
(09:49 +0200)
Conflicts:
configure.ac
Trivial merge