Viewing all changes in revision 334.
- Committer: markpitchless
- Date: 2012-04-11 02:42:10 UTC
- mfrom: (327.1.31 trunk)
- Revision ID: markpitchless@gmail.com-20120411024210-uuvr2tztaq2hmll2
Merge trunk
- files added:
- sr_hand/launch/load_hand_model.launch
- sr_movements/launch
- files removed:
- add_gpl.sh
- cyberglove
- cyberglove/bin
- cyberglove/bin/test
- cyberglove/include
- cyberglove/include/cyberglove
- cyberglove/model
- cyberglove/python_lib
- cyberglove/src
- cyberglove/srv
- cyberglove/test
- denso_arm
- denso_arm/include
- denso_arm/include/b-Cap
- denso_arm/include/denso_arm
- denso_arm/launch
- denso_arm/model
- denso_arm/nodes
- denso_arm/src
- denso_arm/test
- denso_msgs
- denso_msgs/action
- denso_msgs/srv
- doc
- doc/doxygen
- doc/images
- doc/reports
- doc/rosdoc
- eodev
- kinect_color_segmentation
- kinect_color_segmentation/include
- kinect_color_segmentation/include/kinect_color_segmentation
- kinect_color_segmentation/launch
- kinect_color_segmentation/lib
- kinect_color_segmentation/src
- kinect_color_segmentation/srv
- kinematics_tests
- kinematics_tests/src
- math_utils
- math_utils/bin
- math_utils/include
- math_utils/include/math_utils
- math_utils/lib
- math_utils/src
- math_utils/src/euslisp
- sr_automatic_pid_tuning
- sr_automatic_pid_tuning/include
- sr_automatic_pid_tuning/include/sr_automatic_pid_tuning
- sr_automatic_pid_tuning/src
- sr_control_gui
- sr_control_gui/images
- sr_control_gui/images/glove_calibration
- sr_control_gui/images/icons
- sr_control_gui/images/icons/colors
- sr_control_gui/param
- sr_control_gui/saved_scripts
- sr_control_gui/src
- sr_control_gui/src/sr_control_gui
- sr_control_gui/src/sr_control_gui/dock_widgets
- sr_control_gui/src/sr_control_gui/plugins
- sr_control_gui/src/sr_control_gui/plugins/arm_joint_sliders
- sr_control_gui/src/sr_control_gui/plugins/bootloader
- sr_control_gui/src/sr_control_gui/plugins/change_controllers
- sr_control_gui/src/sr_control_gui/plugins/circle_scope
- sr_control_gui/src/sr_control_gui/plugins/controller_tuner
- sr_control_gui/src/sr_control_gui/plugins/cyberglove_calibrator_plugin
- sr_control_gui/src/sr_control_gui/plugins/diamond
- sr_control_gui/src/sr_control_gui/plugins/ethercat_sliders
- sr_control_gui/src/sr_control_gui/plugins/grasp_controller
- sr_control_gui/src/sr_control_gui/plugins/hand_calibration
- sr_control_gui/src/sr_control_gui/plugins/hand_joint_sliders
- sr_control_gui/src/sr_control_gui/plugins/motor_resetter
- sr_control_gui/src/sr_control_gui/plugins/movement_recorder
- sr_control_gui/src/sr_control_gui/plugins/object_selection
- sr_control_gui/src/sr_control_gui/plugins/sensor_scope
- sr_control_gui/src/sr_control_gui/plugins/utils
- sr_convenient_dependencies
- sr_dremmeling_wall
- sr_dremmeling_wall/src
- sr_friction_compensation
- sr_friction_compensation/src
- sr_grasp_planner
- sr_grasp_planner/include
- sr_grasp_planner/include/sr_grasp_planner
- sr_grasp_planner/src
- sr_remappers
- sr_remappers/bin
- sr_remappers/include
- sr_remappers/include/sr_remappers
- sr_remappers/param
- sr_remappers/src
- sr_smach_example
- sr_smach_example/src
- sr_tests
- sr_tests/include
- sr_tests/include/sr_tests
- sr_tests/src
- sr_tests/src/sr_hand
- sr_tests/tests
- sr_tests/tests/sr_hand
- sr_unplug_connector
- sr_unplug_connector/launch
- sr_unplug_connector/src
- static_tf_kinect_to_base_calibration
- static_tf_kinect_to_base_calibration/data
- static_tf_kinect_to_base_calibration/data/.svn
- static_tf_kinect_to_base_calibration/data/.svn/prop-base
- static_tf_kinect_to_base_calibration/data/.svn/props
- static_tf_kinect_to_base_calibration/data/.svn/text-base
- static_tf_kinect_to_base_calibration/data/4x4
- static_tf_kinect_to_base_calibration/data/multi
- static_tf_kinect_to_base_calibration/launch
- static_tf_kinect_to_base_calibration/src
- threeD_mouse
- threeD_mouse/include
- threeD_mouse/include/threeD_mouse
- threeD_mouse/src
- files modified:
- .bzrignore
expand all
collapse all
added
removed
doc/images/Gazebo_001.png
doc/images/RViz_001.png
doc/images/RViz_008.png
doc/images/Screenshot.png
doc/images/fist.png
doc/images/glove.png
doc/images/glove_btn.png
doc/images/gui_arm_jt_slid.png
doc/images/gui_cyberglove.png
doc/images/gui_dropdown.png
doc/images/gui_hand_grasp_ctrl.png
doc/images/gui_hand_jt_slid.png
doc/images/gui_hand_mvt_rec.png
doc/images/rxbag_1.jpeg
doc/images/rxbag_replay.jpeg
doc/images/rxgraph.png
doc/images/thumb_first_finger_tip.png
doc/images/thumb_little_tip.png
doc/images/thumb_middle_finger_tip.png
doc/images/thumb_ring_finger_tip.png
sr_control_gui/images/glove_calibration/step1-a.jpeg
sr_control_gui/images/glove_calibration/step1-b.jpeg
sr_control_gui/images/glove_calibration/step2-a.jpeg
sr_control_gui/images/glove_calibration/step2-b.jpeg
sr_control_gui/images/glove_calibration/step3-a.jpeg
sr_control_gui/images/glove_calibration/step3-b.jpeg
sr_control_gui/images/glove_calibration/step4-a.jpeg
sr_control_gui/images/glove_calibration/step4-b.jpeg
sr_control_gui/images/icons/app_icon.png
sr_control_gui/images/icons/application-exit.png
sr_control_gui/images/icons/color_wheel.png
sr_control_gui/images/icons/colors/blue.png
sr_control_gui/images/icons/colors/green.png
sr_control_gui/images/icons/colors/light_blue.png
sr_control_gui/images/icons/colors/orange.png
sr_control_gui/images/icons/colors/pink.png
sr_control_gui/images/icons/colors/purple.png
sr_control_gui/images/icons/colors/red.png
sr_control_gui/images/icons/colors/yellow.png
sr_control_gui/images/icons/hide.png
sr_control_gui/images/icons/iconArm.png
sr_control_gui/images/icons/iconArmHand.png
sr_control_gui/images/icons/iconGlove.png
sr_control_gui/images/icons/iconHand.png
sr_control_gui/images/icons/load.png
sr_control_gui/images/icons/local.png
sr_control_gui/images/icons/pause.png
sr_control_gui/images/icons/play.png
sr_control_gui/images/icons/refresh.png
sr_control_gui/images/icons/remote.png
sr_control_gui/images/icons/robot_libraries.png
sr_control_gui/images/icons/ros.jpg
sr_control_gui/images/icons/save.png
sr_control_gui/images/icons/show.png
sr_control_gui/images/icons/stop.png
sr_control_gui/images/image-missing.png
sr_movements/movements/short_test.png
sr_movements/movements/test.png
