← Back to branch summary

~ugocupcic/stiff-flop-controllers/trunk

~ugocupcic/stiff-flop-controllers/trunk

« back to all changes in this revision

Viewing changes to sf_mechanism_controllers/manifest.xml

Committer: Toni Oliver
Date: 2012-05-14 20:04:51 UTC
mfrom: (31.1.6 stiff_flop_controllers)
Revision ID: toliver.shadow@gmail.com-20120514200451-5tieg66tghajxlik

Merged with trunk

files added:
sf_controller_msgs/msg/PositionOrientationPassthroughCommand.msg

sf_controller_msgs/msg/Pump.msg

sf_controller_msgs/msg/Valve.msg

sf_mechanism_controllers/include/sf_mechanism_controllers/sf_haptic_controller.hpp

sf_mechanism_controllers/include/sf_mechanism_controllers/sf_position_orientation_controller_passthrough.hpp

sf_mechanism_controllers/src/sf_haptic_controller.cpp

sf_mechanism_controllers/src/sf_position_orientation_controller_passthrough.cpp

files removed:
sf_mechanism_controllers/sf_position_orientation.yaml

sf_mechanism_controllers/sf_stiffness.yaml

sf_mechanism_controllers/sf_tip_roll.yaml

files modified:
.bzrignore

sf_mechanism_controllers/CMakeLists.txt

sf_mechanism_controllers/controller_plugins.xml

sf_mechanism_controllers/include/sf_mechanism_controllers/sf_position_orientation_controller.hpp

sf_mechanism_controllers/include/sf_mechanism_controllers/sf_stiffness_controller.hpp

sf_mechanism_controllers/manifest.xml

sf_mechanism_controllers/src/sf_stiffness_controller.cpp

sf_mechanism_controllers/test/sf_controller_test.py

Show diffs side-by-side

added added

removed removed

sf_mechanism_controllers/manifest.xml

11

11

<url>http://ros.org/wiki/sr_mechanism_controllers</url>

12

12

13

13

<depend package="std_msgs" />

14

<depend package="sensor_msgs" />

14

15

<depend package="std_srvs" />

15

16

<depend package="roscpp" />

16

17

<depend package="actionlib"/>

Older »