Merge remote-tracking branch 'origin/master' into blender2.8
authorDalai Felinto <dfelinto@gmail.com>
Wed, 3 May 2017 21:55:29 +0000 (23:55 +0200)
committerDalai Felinto <dfelinto@gmail.com>
Wed, 3 May 2017 21:55:29 +0000 (23:55 +0200)
1  2 
make.bat

diff --cc make.bat
Simple merge