Merge remote-tracking branch 'origin/0.10'
authorThibault Saunier <thibault.saunier@collabora.com>
Sat, 5 May 2012 17:00:49 +0000 (13:00 -0400)
committerThibault Saunier <thibault.saunier@collabora.com>
Sat, 5 May 2012 17:02:20 +0000 (13:02 -0400)
commit2e52fe15f014ea81bca216620a4bf099b855cea3
treeab76f4c1a9818c274976728773580d1f92b20b32
parent2c6e4f2e69f84ca4fce818e8d751ef2023fbf45b
parent43b815925a2de16ee15e0745f786f1ea8758a30f
Merge remote-tracking branch 'origin/0.10'

Conflicts:
bindings/python/ges.defs
ges/ges-track-video-transition.c
docs/libs/ges-sections.txt
ges/ges-timeline-object.c
ges/ges-timeline.c
ges/ges-track-object.c
ges/ges-track-video-transition.c
ges/ges-track.c