Merge remote-tracking branch 'upstream/master' into fix_boxbox_collision
Conflicts: test/test_fcl_geometric_shapes.cpp
No related branches found
No related tags found
Showing
- .travis.yml 2 additions, 1 deletion.travis.yml
- CMakeLists.txt 7 additions, 0 deletionsCMakeLists.txt
- CMakeModules/cmake_uninstall.cmake.in 21 additions, 0 deletionsCMakeModules/cmake_uninstall.cmake.in
- LICENSE 32 additions, 0 deletionsLICENSE
- README.md 1 addition, 1 deletionREADME.md
- include/fcl/BV/AABB.h 3 additions, 2 deletionsinclude/fcl/BV/AABB.h
- include/fcl/BV/BV.h 3 additions, 2 deletionsinclude/fcl/BV/BV.h
- include/fcl/BV/BV_node.h 3 additions, 2 deletionsinclude/fcl/BV/BV_node.h
- include/fcl/BV/OBB.h 3 additions, 2 deletionsinclude/fcl/BV/OBB.h
- include/fcl/BV/OBBRSS.h 3 additions, 2 deletionsinclude/fcl/BV/OBBRSS.h
- include/fcl/BV/RSS.h 3 additions, 2 deletionsinclude/fcl/BV/RSS.h
- include/fcl/BV/kDOP.h 3 additions, 2 deletionsinclude/fcl/BV/kDOP.h
- include/fcl/BV/kIOS.h 3 additions, 2 deletionsinclude/fcl/BV/kIOS.h
- include/fcl/BVH/BVH_front.h 3 additions, 2 deletionsinclude/fcl/BVH/BVH_front.h
- include/fcl/BVH/BVH_internal.h 3 additions, 2 deletionsinclude/fcl/BVH/BVH_internal.h
- include/fcl/BVH/BVH_model.h 3 additions, 2 deletionsinclude/fcl/BVH/BVH_model.h
- include/fcl/BVH/BVH_utility.h 3 additions, 2 deletionsinclude/fcl/BVH/BVH_utility.h
- include/fcl/BVH/BV_fitter.h 3 additions, 3 deletionsinclude/fcl/BVH/BV_fitter.h
- include/fcl/BVH/BV_splitter.h 3 additions, 2 deletionsinclude/fcl/BVH/BV_splitter.h
- include/fcl/CMakeLists.txt 2 additions, 2 deletionsinclude/fcl/CMakeLists.txt
Loading
Please register or sign in to comment