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.

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

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

2016-08-10 15:06:40 +02:00

..

extern/include

Grease Pencil v2 Branch

2016-08-03 23:39:36 +02:00

intern

Merge branch 'master' into blender2.8

2016-08-10 15:06:40 +02:00

CMakeLists.txt

Refactor translation code out of blenfont

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