-
Tim-Philipp Müller authored
Conflicts: bindings/python/Makefile.am bindings/python/ges-types.defs bindings/python/ges.defs bindings/python/ges.override bindings/python/gesmodule.c bindings/python/testsuite/test_textoverlay.py
5d02075d
Conflicts: bindings/python/Makefile.am bindings/python/ges-types.defs bindings/python/ges.defs bindings/python/ges.override bindings/python/gesmodule.c bindings/python/testsuite/test_textoverlay.py