Skip to content
Commit ce161dbe authored by Michal Petr's avatar Michal Petr
Browse files

Merge remote-tracking branch 'origin/main' into xpetr2

# Conflicts:
#	com/src/frame.cpp
#	math/include/math/bounding_volume.hpp
#	math/include/math/geometry.hpp
#	math/include/math/geometry/face.hpp
#	math/include/math/geometry/feature.hpp
#	math/include/math/geometry/halfedge.hpp
#	math/include/math/geometry/mesh.hpp
#	math/include/math/geometry/plane.hpp
#	math/include/math/geometry/ray.hpp
#	math/include/math/geometry/shape.hpp
#	math/include/math/geometry/utils.hpp
#	math/include/math/geometry/vertex.hpp
#	math/include/math/math_binding_glm.hpp
#	math/src/bounding_volume.cpp
#	math/src/geometry/face.cpp
#	math/src/geometry/halfedge.cpp
#	math/src/geometry/mesh.cpp
#	math/src/geometry/ray.cpp
#	math/src/geometry/shape.cpp
#	math/src/geometry/vertex.cpp
#	utils/include/utils/context_utils.hpp
#	utils/src/context_utils.cpp
parents fc69964b 03c4aca1
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment