Bastien Montagne cbce7fef16 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/blenkernel/intern/pointcache.c
	source/blender/makesrna/intern/rna_main_api.c
	source/blender/makesrna/intern/rna_particle.c

2016-06-27 15:59:01 +02:00

..

blender

Merge branch 'master' into blender2.8

2016-06-27 15:59:01 +02:00

blenderplayer

Merge branch 'master' into blender2.8

2016-06-27 15:59:01 +02:00

creator

Merge branch 'master' into blender2.8

2016-06-27 15:59:01 +02:00

gameengine

Merge branch 'master' into blender2.8

2016-06-23 07:52:58 +10:00

CMakeLists.txt

Move tests into tests/ top-level dir

2014-06-18 22:03:46 +10:00