Sybren A. Stüvel 405980b1fa Merge branch 'master' into blender2.8 ...

# Conflicts:
#	source/blender/alembic/intern/abc_exporter.cc
#	source/blender/alembic/intern/abc_exporter.h
#	source/blender/alembic/intern/alembic_capi.cc
#	tests/gtests/alembic/abc_export_test.cc

2017-10-29 15:38:55 +01:00

..

gtests

Merge branch 'master' into blender2.8

2017-10-29 15:38:55 +01:00

python

Merge branch 'master' into blender2.8

2017-10-18 16:40:31 +11:00

check_deprecated.py

Tests: fix incorrect check for hidden dir

2017-08-23 15:36:39 +10:00

CMakeLists.txt

Fix compilation error when building without Blender

2017-08-08 11:32:33 +02:00