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

Merge remote-tracking branch 'origin/master' into RobotUnit_v3

parents d9f480f4 44cc5fd3
No related branches found
No related tags found
No related merge requests found
......@@ -119,7 +119,7 @@ namespace armarx
svi.addBaseClass<SensorValue1DoFActuatorVelocity>();
svi.addBaseClass<SensorValue1DoFActuatorAcceleration>();
svi.addBaseClass<SensorValue1DoFActuatorTorque>();
svi.addBaseClass<SensorValue1DoFGravityTorque>();
//svi.addBaseClass<SensorValue1DoFGravityTorque>();
return svi;
}
};
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment