Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

F

franka_description
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

This is an archived project. Repository and other project resources are read-only.

df2b8dff

Commit df2b8dff authored 7 years ago by Florian Walch

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/develop' into tau-j-d-without-gravity

parents 21dd3ad8 3a6161c7

No related branches found

No related tags found

No related merge requests found

Changes 8

Show whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 5 additions, 3 deletions

CHANGELOG.md
franka_gripper/CMakeLists.txt 1 addition, 6 deletions

franka_gripper/CMakeLists.txt
franka_gripper/action/Grasp.action 0 additions, 1 deletion

franka_gripper/action/Grasp.action
franka_gripper/config/gripper_node_config.yaml 0 additions, 3 deletions

franka_gripper/config/gripper_node_config.yaml
franka_gripper/include/franka_gripper/franka_gripper.h 2 additions, 5 deletions

franka_gripper/include/franka_gripper/franka_gripper.h
franka_gripper/msg/GraspEpsilon.msg 0 additions, 2 deletions

franka_gripper/msg/GraspEpsilon.msg
franka_gripper/src/franka_gripper.cpp 2 additions, 5 deletions

franka_gripper/src/franka_gripper.cpp
franka_gripper/src/franka_gripper_node.cpp 2 additions, 14 deletions

franka_gripper/src/franka_gripper_node.cpp

with 12 additions and 39 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment