Merge branch '0.10'
authorThibault Saunier <thibault.saunier@collabora.com>
Thu, 29 Mar 2012 16:55:44 +0000 (12:55 -0400)
committerThibault Saunier <thibault.saunier@collabora.com>
Thu, 29 Mar 2012 16:55:44 +0000 (12:55 -0400)
Conflicts:
bindings/python/ges.defs

1  2 
docs/libs/ges-sections.txt
ges/ges-timeline-layer.c
ges/ges-timeline-object.c
ges/ges-timeline.c
ges/ges-track-object.c
ges/ges-track.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc ges/ges-track.c
Simple merge