Sebastian Dröge 8429fd526c Merge remote-tracking branch 'origin/0.10' ... Conflicts: bindings/python/Makefile.am ges/Makefile.am		2012-04-04 12:08:06 +02:00
..
.gitignore	Opening the 0.11 branch	2011-08-05 13:24:44 +02:00
ges-launch.c	Merge remote-tracking branch 'origin/master' into 0.11	2012-03-12 15:25:49 +00:00
Makefile.am	formatter: Try to figure out new paths when media files have moved	2012-04-03 20:41:27 -04:00