Merge branch 'blender2.7'
authormano-wii <germano.costa@ig.com.br>
Fri, 22 Mar 2019 19:23:23 +0000 (16:23 -0300)
committermano-wii <germano.costa@ig.com.br>
Fri, 22 Mar 2019 19:23:23 +0000 (16:23 -0300)
 Conflicts:
CMakeLists.txt

1  2 
CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge