Explorar o código

Merge branch 'master-upstream' into python_bindings

# Conflicts:
#	python/scripts/generate_bindings.py


Former-commit-id: d03555f9cf8a2aaff4a459ee4ec7b979c552aae7
Sebastian Koch %!s(int64=9) %!d(string=hai) anos
pai
achega
6d3b460b47

Os datos das diferenzas Diff non están dispoñibles.