Bastien Montagne ceed34aac1 Merge branch 'blender2.7' ...

Conflicts:
	source/blender/blenkernel/intern/library.c
	source/blender/blenloader/intern/readfile.c
	source/blender/editors/screen/screen_edit.c

2019-05-22 23:36:02 +02:00

..

blender

Merge branch 'blender2.7'

2019-05-22 23:36:02 +02:00

creator

Fix WITH_PYTHON_MODULE linking

2019-05-22 11:20:40 +10:00

tools @ 2afbb8ec47

UI: Nudge Curve Editor Away from Scrollbar

2019-05-11 11:05:40 -07:00

CMakeLists.txt

ClangFormat: apply to source, most of intern

2019-04-17 06:21:24 +02:00