Skip to content
Snippets Groups Projects
Commit 7729ac09 authored by Simon Ottenhaus's avatar Simon Ottenhaus
Browse files

Merge branch 'stable' into master: 

Fixed segfault in TCPControlUnit

Conflicts:
	source/RobotAPI/components/units/HeadIKUnit.cpp
	source/RobotAPI/components/units/TCPControlUnit.cpp
	source/RobotAPI/interface/observers/ObserverFilters.ice
	source/RobotAPI/libraries/core/RobotAPIObjectFactories.h
	source/RobotAPI/libraries/core/observerfilters/MatrixFilters.h
parents 9ebb35be b37e0a78
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 667 additions and 57 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