Julian Eisel e42e1769b3 Merge branch 'master' into blender2.8 ... Conflicts: source/blender/editors/gpencil/drawgpencil.c		2017-01-05 00:31:15 +01:00
build_files	Merge branch 'master' into blender2.8	2016-12-12 16:17:57 +01:00
doc	API: Fix rst syntax	2017-01-02 00:33:15 -05:00
extern	Gtest: Fix/workaround MSVC complains about use of struct with alignment	2016-12-15 17:53:57 +01:00
intern	Revert particle system and point cache removal in blender2.8 branch.	2016-12-28 17:30:58 +01:00
release	Merge branch 'master' into blender2.8	2017-01-05 00:31:15 +01:00
source	Merge branch 'master' into blender2.8	2017-01-05 00:31:15 +01:00
tests	Add BLI_string_utf8 specific test.	2016-12-31 16:10:20 +01:00
.arcconfig	Use HTTPS protocol for arc	2013-12-24 22:57:27 +06:00
.gitignore	Update .gitignore to some more generated/non-git-stored files.	2016-08-21 22:40:57 +02:00
.gitmodules	Add developer tools submodule	2016-07-15 01:28:00 +10:00
CMakeLists.txt	Merge branch 'master' into blender2.8	2016-12-29 20:05:22 +01:00
COPYING	== docs ==	2010-10-13 14:44:22 +00:00
GNUmakefile	Cleanup: line length	2016-07-15 01:26:26 +10:00
make.bat	[MSVC] Preliminary VS2017 support.	2016-11-16 20:13:58 -07:00