Merge remote-tracking branch 'origin/0.10'
authorThibault Saunier <thibault.saunier@collabora.com>
Thu, 3 May 2012 02:03:51 +0000 (22:03 -0400)
committerThibault Saunier <thibault.saunier@collabora.com>
Thu, 3 May 2012 02:03:51 +0000 (22:03 -0400)
commit2c6e4f2e69f84ca4fce818e8d751ef2023fbf45b
treefe39fe8ab24f3b51e3e2ba166833c999c47545e9
parent8542d18d4372a8e2ace07321001b7c5d5aaa2a5e
parent959bc5e0cbec80930a02ecaf739a47a5f827f5cb
Merge remote-tracking branch 'origin/0.10'

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