Skip to content
Snippets Groups Projects
Commit 03193501 authored by Raphael Grimm's avatar Raphael Grimm
Browse files

Merge remote-tracking branch 'origin/armar6demo' into Ice3.7

parents 1ef5ecf2 a137741e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
source/RobotAPI/libraries/CMakeLists.txt
+ 2
− 1
View file @ 03193501
......@@ -8,6 +8,7 @@ add_subdirectory(RobotAPIVariantWidget)
add_subdirectory(RobotAPINJointControllers)
add_subdirectory(DMPController)
add_subdirectory(DSControllers)
# disabled until Mathlib include is fixed...
#add_subdirectory(DSControllers)
add_subdirectory(RobotStatechartHelpers)
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