Bastien Montagne 9be6d5ff18 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/blenkernel/intern/depsgraph.c
	source/blender/blenloader/intern/versioning_270.c
	source/blender/depsgraph/intern/builder/deg_builder_relations.cc
	source/blender/makesrna/intern/rna_main_api.c
	source/blender/makesrna/intern/rna_particle.c

2016-12-12 16:17:57 +01:00

..

blender

Merge branch 'master' into blender2.8

2016-12-12 16:17:57 +01:00

blenderplayer

Merge branch 'master' into blender2.8

2016-11-07 15:46:27 +01:00

creator

Merge branch 'master' into blender2.8

2016-12-12 16:17:57 +01:00

gameengine

Merge remote-tracking branch 'origin/master' into blender2.8

2016-11-16 17:04:21 +01:00

tools @ 896c5f7895

Point submodules to latest master branches

2016-09-02 11:44:22 +02:00

CMakeLists.txt

Move tests into tests/ top-level dir

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