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)
commitc2b2f9baa88e6bec9323ee8f2d9d8fc1861aeef5
tree808e981e3d6d885b814c27660199d1a66ec29b1d
parent243a9254ea579915e697cfde59e9c4f6e9ffd4ee
parentedcb5415a275cd121b49972fa8baead4b43cad4d
Merge branch 'blender2.7'

 Conflicts:
CMakeLists.txt
CMakeLists.txt