Bastien Montagne 95b3632112 Merge branch 'master' into blender2.8 ...

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

2017-04-14 12:39:54 +02:00

..

CMakeLists.txt

Audaspace: fixing problems for the merge to master suggested by Campbell and Sergey.

2015-07-28 14:01:53 +02:00

sound_intern.h

Cleanup: redundant struct declarations

2015-03-29 03:56:39 +11:00

sound_ops.c

Merge branch 'master' into blender2.8

2017-04-14 12:39:54 +02:00