projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c4ea888
81b71b6
)
Merge remote-tracking branch 'origin/master' into 0.11
author
Edward Hervey
<edward.hervey@collabora.co.uk>
Fri, 30 Dec 2011 10:49:27 +0000
(11:49 +0100)
committer
Edward Hervey
<edward.hervey@collabora.co.uk>
Fri, 30 Dec 2011 10:49:27 +0000
(11:49 +0100)
Conflicts:
tests/examples/camerabin2/Makefile.am
Trivial merge