Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 13 Sep 2018 06:21:56 +0000 (16:21 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 13 Sep 2018 06:21:56 +0000 (16:21 +1000)
1  2 
GNUmakefile

diff --cc GNUmakefile
Simple merge