Bastien Montagne 1f46da922a Merge branch 'master' into blender2.8 ... Conflicts: source/blender/blenloader/intern/versioning_270.c source/blender/depsgraph/intern/depsgraph_tag.cc source/blender/editors/mask/mask_draw.c		2017-05-19 09:36:14 +02:00
build_files	Merge branch 'master' into blender2.8	2017-05-19 09:36:14 +02:00
doc	Merge branch 'master' into blender2.8	2017-04-29 16:32:30 +10:00
extern	Merge branch 'master' into blender2.8	2017-04-30 03:06:42 +10:00
intern	Merge branch 'master' into blender2.8	2017-05-19 09:36:14 +02:00
release	Remove use_display_lists option	2017-05-19 10:07:02 +10:00
source	Merge branch 'master' into blender2.8	2017-05-19 09:36:14 +02:00
tests	Merge branch 'master' into blender2.8	2017-04-28 15:52:07 +02:00
.arcconfig	Blender 2.8: Update arc config	2017-05-01 15:20:19 +02:00
.gitignore	Update .gitignore to some more generated/non-git-stored files.	2016-08-21 22:40:57 +02:00
.gitmodules	Merge branch 'master' into blender2.8	2017-04-03 15:15:56 +02:00
CMakeLists.txt	Force core profile as main profile	2017-05-11 16:47:46 +02:00
COPYING	== docs ==	2010-10-13 14:44:22 +00:00
GNUmakefile	Merge branch 'master' into blender2.8	2017-03-12 03:00:06 +11:00
make.bat	Merge remote-tracking branch 'origin/master' into blender2.8	2017-05-03 23:55:29 +02:00