Merge branch 'groovy-devel' of github.com:KaijenHsiao/pr2_object_manipulation into groovy-devel
switched to new shape msg; not yet compiled
finished port to new Shape message
more changes for migrating to Shape
Merge branch 'groovy-devel' of github.com:ros-interactive-manipulation/pr2_object_manipulation into shape-msg
changed pr2_marker_control behaviour: not doing a full reset when menus change, instead calling reApply
changed pr2_marker_control behaviour: only resetting control markers on controller change
Merge branch 'groovy-devel' of github.com:ros-interactive-manipulation/pr2_object_manipulation into groovy-devel
call initControlMarkers on upper arm click
Merge pull request #23 from jkammerl/groovy-devel

adding parameter to disable kinect launch
added re-init control markers when switching controllers
marker_control: make only clickable links buttons, non-interactive otherwise
Update manipulation/rgbd_assembler/launch/rgbd_kinect_assembler.launch

changed depth channel to depth_registered channel on physical robot. Previous version was inconsistent.
added capability to use freenect driver. default remains openni
Added ability to use freenect driver. Made it the new default
updated pluginlib export macro
made launchfiles non-executable
Merge branch 'groovy-devel' of github.com:jon-weisz/pr2_object_manipulation into groovy-devel
addition to #25: use arg instead of group for freenect/openni.
Update manipulation/pr2_marker_control/src/marker_control.cpp