Edward Hervey a32f1bd4dc Merge remote-tracking branch 'origin/master' into 0.11 ... Conflicts: bindings/python/Makefile.am bindings/python/ges.override bindings/python/gesmodule.c configure.ac		2011-12-30 17:24:37 +01:00
..
.gitignore	Opening the 0.11 branch	2011-08-05 13:24:44 +02:00
ges-launch.c	tools: Add proper include for g_printf	2011-12-30 17:20:23 +01:00
Makefile.am	android: make it ready for androgenizer	2011-04-11 17:15:55 +02:00