• thomas's avatar
    Merge branch 'develop' of icube-forge.unistra.fr:pitiot/volusion into develop · e5cfadee
    thomas authored
    Conflicts:
    	build/CMakeFiles/CMakeError.log
    	build/CMakeFiles/CMakeOutput.log
    	build/CMakeFiles/Volusion.dir/include/moc_viewer.cxx.o
    	build/CMakeFiles/Volusion.dir/src/ArticulatedObject.cpp.o
    	build/CMakeFiles/Volusion.dir/src/env_map.cpp.o
    	build/CMakeFiles/Volusion.dir/src/knife.cpp.o
    	build/CMakeFiles/Volusion.dir/src/needle.cpp.o
    	build/CMakeFiles/Volusion.dir/src/simulator.cpp.o
    	build/CMakeFiles/Volusion.dir/src/tree.cpp.o
    	build/CMakeFiles/Volusion.dir/src/viewer.cpp.o'
    Signed-off-by: 's avatarthomas <thomas@thomas-S551LN.(none)>
    e5cfadee