Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 13 Jul 2018 16:18:35 +0000 (18:18 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 13 Jul 2018 16:20:10 +0000 (18:20 +0200)
commit5e2804a40be649e55a827b08d3c424001be43006
treefc3aa55de409baf60a677897cf9d06a63e8502c6
parent135b7f5c6ab5761669256d1f15e37122ec9533cb
parent87535dd73d3a2b76f7ede2448a2c471a40c79aaa
Merge branch 'master' into blender2.8
GNUmakefile