projects
/
platform
/
upstream
/
gst-libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9c044ac
6c290ab
)
Merge branch 'master' into 0.11
author
Wim Taymans
<wim.taymans@collabora.co.uk>
Fri, 4 Nov 2011 10:02:32 +0000
(11:02 +0100)
committer
Wim Taymans
<wim.taymans@collabora.co.uk>
Fri, 4 Nov 2011 10:02:32 +0000
(11:02 +0100)
Conflicts:
configure.ac
Trivial merge