Sybren A. Stüvel 781108cdc6 Merge branch 'master' into blender2.8 ...

# Conflicts:
#	source/blender/alembic/intern/abc_exporter.cc
#	source/blender/alembic/intern/abc_exporter.h

2017-04-19 15:07:54 +02:00

..

gtests

Fix building alembic gtest with buildinfo...

2017-04-07 10:44:13 +02:00

python

Merge branch 'master' into blender2.8

2017-04-19 15:07:54 +02:00

check_deprecated.py

Remove SCons building system

2016-01-04 14:20:48 +05:00

CMakeLists.txt

…