archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity
This repository has been archived on 2023-10-09. You can view files and clone it. You cannot open issues or pull requests or push a commit.
Files
cbce7fef1604fdfd3099fd196b2a44f61b22eb76
blender-archive/source
History
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
…