Merge remote-tracking branch 'origin/0.10'
authorThibault Saunier <thibault.saunier@collabora.com>
Thu, 10 May 2012 18:56:34 +0000 (14:56 -0400)
committerThibault Saunier <thibault.saunier@collabora.com>
Thu, 10 May 2012 18:56:34 +0000 (14:56 -0400)
commit406bc5fe285c7cf91c3ebbf2a855daf5b569057b
tree142555f717608ace4ef80c651d7434363a608bdd
parentea254c4621108efa30c1cc4366f8fb09d8cbc8e6
parent9ee94b3d40cac32fd478e8d49bfb328cd3955e29
Merge remote-tracking branch 'origin/0.10'
ges/ges-timeline.c
ges/ges-track-object.c
ges/ges-track-video-transition.c
ges/ges-track.c