Bastien Montagne 346964eb3f Merge branch 'master' into blender2.8 ... Conflicts: source/blender/editors/gpencil/drawgpencil.c		2017-04-10 16:53:12 +02:00
..
build_environment	Merge branch 'master' into blender2.8	2017-04-10 16:53:12 +02:00
buildbot	Buildbot: List freetype for OIIO libraries	2017-04-07 17:01:07 +02:00
cmake	Merge branch 'master' into blender2.8	2017-04-09 16:09:12 +10:00
package_spec	Call to python3 for stand-alone scripts	2016-07-26 05:18:00 +10:00
utils	Update source tgz builder script	2016-09-29 10:05:42 +02:00