From ef75ef6c648a2c8508afaca55bd5b81d34db3f37 Mon Sep 17 00:00:00 2001 From: Daniel Seidel Date: Mon, 8 Jul 2013 14:49:43 +0200 Subject: [PATCH 6/6] renamed ObjectCollision field in RobotCollision --- proto/sandbox/rst/robot/RobotCollision.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proto/sandbox/rst/robot/RobotCollision.proto b/proto/sandbox/rst/robot/RobotCollision.proto index b96b681..844ca12 100644 --- a/proto/sandbox/rst/robot/RobotCollision.proto +++ b/proto/sandbox/rst/robot/RobotCollision.proto @@ -53,6 +53,6 @@ message RobotCollision { * @ref .object_collision.object_2 designate the colliding robot * part and the environment object respectively. */ - required kinematics.ObjectCollision object_collision = 2; + required kinematics.ObjectCollision collision_detail = 2; } -- 1.7.9.5