Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Wed, 28 Nov 2018 15:52:47 +0000 (16:52 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Wed, 28 Nov 2018 15:52:47 +0000 (16:52 +0100)
commit278d9c83229470abcedda42cac06a9784f2ed8f3
tree6df04df8ecef4c97605977948805d0ebc81adcd1
parent6fd5f95ca111543ccd37da118551a2b4d94dfdb7
parentc16321cb9dc983d174e7f5888d66118ef5f76a92
Merge branch 'master' into blender2.8

Conflicts:
source/blenderplayer/CMakeLists.txt
tests/gtests/blenlib/CMakeLists.txt
tests/gtests/blenlib/CMakeLists.txt