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

Conflicts:
	source/blender/blenkernel/BKE_particle.h
	source/blender/blenkernel/intern/library.c
	source/blender/blenkernel/intern/particle.c

2016-07-25 15:07:17 +02:00

..

extern/include

Cleanup: style, spelling

2016-07-19 09:16:38 +10:00

intern

Merge branch 'master' into blender2.8

2016-07-25 15:07:17 +02:00

CMakeLists.txt

Refactor translation code out of blenfont

2015-08-18 07:01:26 +10:00