Merge remote-tracking branch 'origin/master' into blender2.8
authorDalai Felinto <dfelinto@gmail.com>
Fri, 14 Jul 2017 12:34:46 +0000 (14:34 +0200)
committerDalai Felinto <dfelinto@gmail.com>
Fri, 14 Jul 2017 12:34:46 +0000 (14:34 +0200)
commit9d318acfa79644b0cb40af7860ca3bf6adec1aff
treebddfa6fac83d8cb3892dd2ef25c14307fc7219e1
parent78e2238fe4c03e8beeb06ed801aa2e30c62172dd
parent0f793ee6060301ad97e8c4c1ffe8f0913fc990ea
Merge remote-tracking branch 'origin/master' into blender2.8