projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
98e1463
df6d0b0
)
Merge remote-tracking branch 'origin/0.10'
author
Sebastian Dröge
<sebastian.droege@collabora.co.uk>
Mon, 2 Apr 2012 13:30:04 +0000
(15:30 +0200)
committer
Sebastian Dröge
<sebastian.droege@collabora.co.uk>
Mon, 2 Apr 2012 13:30:04 +0000
(15:30 +0200)
Conflicts:
libs/gst/base/gstbaseparse.c
Trivial merge