Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 18 May 2018 09:02:39 +0000 (11:02 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 18 May 2018 09:02:39 +0000 (11:02 +0200)
1  2 
intern/clog/clog.c
source/creator/creator_args.c

Simple merge
Simple merge