Skip to content
Snippets Groups Projects
Commit daaece9f authored by Rainer Kartmann's avatar Rainer Kartmann
Browse files

Merge remote-tracking branch 'origin/feature/torso-joint-four-bar' into hemisphere-joint-ik 

# Conflicts:
#	VirtualRobot/IK/DifferentialIK.cpp
#	VirtualRobot/Nodes/RobotNodeHemisphere.cpp
parents deb2d32c 08aa3b56
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 2176 additions and 14 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment