baalexander
commented
11 years ago :clap: to resolving merging conflicts
Closed jonbinney closed 11 years ago
baalexander
commented
11 years ago :clap: to resolving merging conflicts
the main purpose of these changes is to make it possible to compile pr2_interactive_manipulation backend stuff without needing rviz. this is necessary because current rviz depends on a version of ogre which isn't available on ubuntu lucid, and the robots are going to be on lucid for a while longer.
changes: moved all IM rviz plugins into a new package "pr2_interactive_manipulation_frontend" which depends on pr2_interactive_manipulation moved plugins from pr2_interactive_object_detection into a new package "pr2_interactive_object_detection" GraspableObjectList message moved from interactive_object_detection to object_manipulation_msgs actions and hypotheses message moved from obejct_recognition_gui and object_segmentation_gui to interactive_perception_msgs modified CMakelists in robot_self_filter_color so that the binaries end up in bin/ added a bazillion .gitignore rules for things message files autogenerated from actions, and source files autogenerated from messages and services
be sure to also merge in the pull request i sent to object_manipulation stack, since i moved a message into that stack from this one.