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)
commitc7e1d067a5ce3ce9803cce5db6ac25f9692a7472
tree586c3fe16c51cf42b020a86dcf8487ae629edee4
parentbb7b1cc884819d2a681f1c93b6bb9c015248aff0
parenta3085190f80d6b61f1871040665ec926f52569d5
Merge branch 'master' into blender2.8
intern/clog/clog.c