[Personalrobots-commit] SF.net SVN: personalrobots:[16389] pkg/trunk

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 16389
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=16389&view=rev
Author:   hsujohnhsu
Date:     2009-05-29 20:06:40 +0000 (Fri, 29 May 2009)

Log Message:
-----------
Merging from branch:
svn merge -r 16128:16141 https://personalrobots.svn.sf.net/svnroot/personalrobots/pkg/branches/gazebo-branch-merge .

Property Changed:
----------------
    pkg/trunk/
    pkg/trunk/robot_descriptions/gazebo_robot_description/Media/
    pkg/trunk/visualization/
    pkg/trunk/visualization/rviz/src/rviz/generated/rviz_generated.i
    pkg/trunk/visualization/rviz/src/rviz/properties/forwards.h
    pkg/trunk/visualization/rviz/src/rviz/robot/robot.cpp
    pkg/trunk/visualization/rviz/src/rviz/robot/robot.h
    pkg/trunk/visualization_core/ogre_tools/
    pkg/trunk/visualization_core/ogre_tools/media/
    pkg/trunk/visualization_core/ogre_tools/src/stl_to_mesh/
    pkg/trunk/visualization_core/ogre_tools/test/

Property changes on: pkg/trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /pkg/branches/gazebo-branch-merge:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016
   + /pkg/branches/gazebo-branch-merge:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141

Property changes on: pkg/trunk/robot_descriptions/gazebo_robot_description/Media
___________________________________________________________________
Modified: svn:mergeinfo
   - /pkg/branches/gazebo-branch-merge/robot_descriptions/gazebo_robot_description/Media:15797-15820,15822-15839,15852-15870,15983-16008,16010-16016
   + /pkg/branches/gazebo-branch-merge/robot_descriptions/gazebo_robot_description/Media:15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141

Property changes on: pkg/trunk/visualization
___________________________________________________________________
Modified: svn:mergeinfo
   - /pkg/branches/gazebo-branch-merge/visualization:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016
/pkg/branches/josh/rviz_selection:12152-13640
/pkg/branches/josh/visualization_scratch:14041-14428
   + /pkg/branches/gazebo-branch-merge/visualization:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141
/pkg/branches/josh/rviz_selection:12152-13640
/pkg/branches/josh/visualization_scratch:14041-14428

Property changes on: pkg/trunk/visualization/rviz/src/rviz/generated/rviz_generated.i
___________________________________________________________________
Modified: svn:mergeinfo
   - /pkg/branches/gazebo-branch-merge/visualization/rviz/src/rviz/generated/rviz_generated.i:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016
/pkg/branches/josh/visualization_scratch/rviz/src/rviz/generated/rviz_generated.i:14041-14428
/pkg/trunk/visualization/rviz/src/rviz/generated/visualization_panel_generated.i:12189
   + /pkg/branches/gazebo-branch-merge/visualization/rviz/src/rviz/generated/rviz_generated.i:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141
/pkg/branches/josh/visualization_scratch/rviz/src/rviz/generated/rviz_generated.i:14041-14428
/pkg/trunk/visualization/rviz/src/rviz/generated/visualization_panel_generated.i:12189

Property changes on: pkg/trunk/visualization/rviz/src/rviz/properties/forwards.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /pkg/branches/gazebo-branch-merge/visualization/rviz/src/rviz/properties/forwards.h:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016
/pkg/branches/josh/visualization_scratch/rviz/src/rviz/properties/forwards.h:14041-14428
/pkg/trunk/visualization/rviz/src/rviz/properties/property_forwards.h:12189,12408-12643,12667
   + /pkg/branches/gazebo-branch-merge/visualization/rviz/src/rviz/properties/forwards.h:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141
/pkg/branches/josh/visualization_scratch/rviz/src/rviz/properties/forwards.h:14041-14428
/pkg/trunk/visualization/rviz/src/rviz/properties/property_forwards.h:12189,12408-12643,12667

Property changes on: pkg/trunk/visualization/rviz/src/rviz/robot/robot.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /pkg/branches/gazebo-branch-merge/visualization/rviz/src/rviz/robot/robot.cpp:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016
/pkg/branches/josh/visualization_scratch/rviz/src/rviz/robot/robot.cpp:14041-14428
/pkg/trunk/visualization/rviz/src/rviz/robot/robot.cpp:497-13654
   + /pkg/branches/gazebo-branch-merge/visualization/rviz/src/rviz/robot/robot.cpp:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141
/pkg/branches/josh/visualization_scratch/rviz/src/rviz/robot/robot.cpp:14041-14428
/pkg/trunk/visualization/rviz/src/rviz/robot/robot.cpp:497-13654

Property changes on: pkg/trunk/visualization/rviz/src/rviz/robot/robot.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /pkg/branches/gazebo-branch-merge/visualization/rviz/src/rviz/robot/robot.h:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016
/pkg/branches/josh/visualization_scratch/rviz/src/rviz/robot/robot.h:14041-14428
/pkg/trunk/visualization/rviz/src/rviz/robot/robot.h:497-13654
   + /pkg/branches/gazebo-branch-merge/visualization/rviz/src/rviz/robot/robot.h:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141
/pkg/branches/josh/visualization_scratch/rviz/src/rviz/robot/robot.h:14041-14428
/pkg/trunk/visualization/rviz/src/rviz/robot/robot.h:497-13654

Property changes on: pkg/trunk/visualization_core/ogre_tools
___________________________________________________________________
Modified: svn:mergeinfo
   - /pkg/branches/gazebo-branch-merge/visualization_core/ogre_tools:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016
/pkg/branches/josh/visualization_scratch/ogre_tools:14041-14418
   + /pkg/branches/gazebo-branch-merge/visualization_core/ogre_tools:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141
/pkg/branches/josh/visualization_scratch/ogre_tools:14041-14418

Property changes on: pkg/trunk/visualization_core/ogre_tools/media
___________________________________________________________________
Modified: svn:mergeinfo
   - /pkg/branches/gazebo-branch-merge/visualization_core/ogre_tools/media:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016
/pkg/branches/josh/visualization_scratch/ogre_tools/media:14041-14418
/pkg/trunk/visualization/ogre_tools/media:2217-8463
   + /pkg/branches/gazebo-branch-merge/visualization_core/ogre_tools/media:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141
/pkg/branches/josh/visualization_scratch/ogre_tools/media:14041-14418
/pkg/trunk/visualization/ogre_tools/media:2217-8463

Property changes on: pkg/trunk/visualization_core/ogre_tools/src/stl_to_mesh
___________________________________________________________________
Modified: svn:mergeinfo
   - /pkg/branches/gazebo-branch-merge/visualization_core/ogre_tools/src/stl_to_mesh:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016
/pkg/branches/josh/visualization_scratch/ogre_tools/src/stl_to_mesh:14041-14418
/pkg/trunk/visualization/ogre_tools/src/stl_to_mesh:2217-2818
   + /pkg/branches/gazebo-branch-merge/visualization_core/ogre_tools/src/stl_to_mesh:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141
/pkg/branches/josh/visualization_scratch/ogre_tools/src/stl_to_mesh:14041-14418
/pkg/trunk/visualization/ogre_tools/src/stl_to_mesh:2217-2818

Property changes on: pkg/trunk/visualization_core/ogre_tools/test
___________________________________________________________________
Modified: svn:mergeinfo
   - /pkg/branches/gazebo-branch-merge/visualization_core/ogre_tools/test:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016
/pkg/branches/josh/visualization_scratch/ogre_tools/test:14041-14418
/pkg/trunk/visualization/ogre_tools/test:2217-3599
   + /pkg/branches/gazebo-branch-merge/visualization_core/ogre_tools/test:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141
/pkg/branches/josh/visualization_scratch/ogre_tools/test:14041-14418
/pkg/trunk/visualization/ogre_tools/test:2217-3599

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.