Viewing all changes in revision 213.
- Committer: Ugo Cupcic
- Date: 2011-05-23 15:44:05 UTC
- mfrom: (119.1.67 sr-ros-interface)
- Revision ID: ugo@shadowrobot.com-20110523154405-kwvv543sy9wxehzi
Huge merge from trunk. Lots of changes.
- files added:
- rviz_config
- shadow_robot/sr_hand/model/desk
- shadow_robot/sr_hand/model/meshes/envelop
- shadow_robot/sr_hand/model/meshes/full
- shadow_robot/sr_hand/model/meshes/original
- shadow_robot/sr_smach_example
- shadow_robot/sr_smach_example/src
- shadow_robot/sr_tests
- shadow_robot/sr_tests/include
- shadow_robot/sr_tests/include/sr_tests
- shadow_robot/sr_tests/src
- shadow_robot/sr_tests/src/sr_hand
- shadow_robot/sr_tests/tests
- shadow_robot/sr_tests/tests/sr_hand
- shadow_robot/sr_utilities
- shadow_robot/sr_utilities/bin
- shadow_robot/sr_utilities/src
- files removed:
- shadow_robot/CMakeLists.txt
- shadow_robot/dataglove
- shadow_robot/dataglove/dataglove_processing
- shadow_robot/dataglove/dataglove_processing/bin
- shadow_robot/dataglove/dataglove_processing/bin/test
- shadow_robot/dataglove/dataglove_processing/include
- shadow_robot/dataglove/dataglove_processing/include/threadpool
- shadow_robot/dataglove/dataglove_processing/include/threadpool/threadpool
- shadow_robot/dataglove/dataglove_processing/include/threadpool/threadpool/detail
- shadow_robot/dataglove/dataglove_processing/review
- shadow_robot/dataglove/dataglove_processing/src
- shadow_robot/dataglove/dataglove_processing/test
- shadow_robot/dataglove/optical_acquisition
- shadow_robot/dataglove/optical_synchronizer
- shadow_robot/dataglove/optical_synchronizer/include
- shadow_robot/dataglove/optical_synchronizer/src
- shadow_robot/sr_display
- shadow_robot/sr_display/bin
- shadow_robot/sr_display/build
- shadow_robot/sr_display/include
- shadow_robot/sr_display/include/sr_display
- shadow_robot/sr_display/src
- shadow_robot/sr_display/srv
- shadow_robot/sr_utilities
- shadow_robot/sr_utilities/src
- files modified:
- .bzrignore
expand all
collapse all
added
removed
shadow_robot/doc/images/Gazebo_001.png
shadow_robot/doc/images/RViz_001.png
shadow_robot/doc/images/glove.png
shadow_robot/doc/images/glove_btn.png
shadow_robot/doc/images/gui_arm_jt_slid.png
shadow_robot/doc/images/gui_cyberglove.png
shadow_robot/doc/images/gui_dropdown.png
shadow_robot/doc/images/gui_hand_grasp_ctrl.png
shadow_robot/doc/images/gui_hand_jt_slid.png
shadow_robot/doc/images/gui_hand_mvt_rec.png
shadow_robot/doc/images/rxbag_1.jpeg
shadow_robot/doc/images/rxbag_replay.jpeg
shadow_robot/doc/images/rxgraph.png
