Merge of all branches of Fabian PK (related to skills)
Compare changes
Files
3- Tobias Bodmer authored
also get rid of some TODOs
+ 1
− 2
@@ -64,7 +64,6 @@ namespace armarx
@@ -117,7 +116,7 @@ namespace armarx
@reister. YOu only need to review the changes to aron (Generator.cpp)
Depends on MR armarx-core!246 (merged)
Includes MR !285 (closed) and !320 (closed)
also get rid of some TODOs