Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 31 Jul 2018 11:27:51 +0000 (21:27 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 31 Jul 2018 11:27:51 +0000 (21:27 +1000)
1  2 
intern/clog/clog.c

Simple merge