projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5e824ef aa923e6)
Merge remote-tracking branch 'origin/0.10'
authorThibault Saunier <thibault.saunier@collabora.com>
Mon, 2 Jul 2012 00:54:42 +0000 (20:54 -0400)
committerThibault Saunier <thibault.saunier@collabora.com>
Mon, 2 Jul 2012 00:54:42 +0000 (20:54 -0400)
Conflicts:
common

1  2 
docs/libs/ges-sections.txt patch | diff1 | diff2 | blob | history
ges/ges-formatter.c patch | diff1 | diff2 | blob | history

diff --cc docs/libs/ges-sections.txt
Simple merge
diff --cc ges/ges-formatter.c
Simple merge
Domain: Multimedia / Media Common;