Merge remote-tracking branch 'origin/0.10'
authorThibault Saunier <thibault.saunier@collabora.com>
Sat, 26 May 2012 21:00:50 +0000 (17:00 -0400)
committerThibault Saunier <thibault.saunier@collabora.com>
Sat, 26 May 2012 21:00:50 +0000 (17:00 -0400)
commitf32fdf13b7bb99fb035aeb3ae82c2bcc751841a6
tree2cb159e3af786214e0bdfcac28e7bf1e9bf1322d
parent830a0cea3b67dbb0f69843dfaf9eab89e30859c7
parent7012280e481617f040923daded849c9a03f6e222
Merge remote-tracking branch 'origin/0.10'

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