Merge branch 'melodic' into documentation

mowito · Sep 2, 2020 · ef15a22 · ef15a22
2 parents 5e4bdf2 + 057438e
commit ef15a22
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 2 deletions.
diff --git a/debians/ros-melodic-behavior-tree_20.6.0-0bionic_amd64.deb b/debians/ros-melodic-behavior-tree_20.6.0-0bionic_amd64.deb
diff --git a/debians/ros-melodic-global-planner_1.0.0-0bionic_amd64.deb b/debians/ros-melodic-global-planner_1.0.0-0bionic_amd64.deb
diff --git a/debians/ros-melodic-mw-global-planner_1.0.0-0bionic_amd64.deb b/debians/ros-melodic-mw-global-planner_1.0.0-0bionic_amd64.deb
diff --git a/debians/ros-melodic-mw-navfn-planner_1.0.0-0bionic_amd64.deb b/debians/ros-melodic-mw-navfn-planner_1.0.0-0bionic_amd64.deb
diff --git a/debians/ros-melodic-recovery-executive_1.1.0-0bionic_amd64.deb b/debians/ros-melodic-recovery-executive_1.1.0-0bionic_amd64.deb
diff --git a/mowito_rosbot/launch/secondary_launch/start_global_planner.launch b/mowito_rosbot/launch/secondary_launch/start_global_planner.launch
@@ -3,9 +3,9 @@
   <arg name="respawn" default="false"/>
   <arg name="output_log" default="screen"/>
 
-  <env name="ROSCONSOLE_CONFIG_FILE" value="$(find global_planner)/custom_config.conf" if="$(arg debug)"/>
+  <env name="ROSCONSOLE_CONFIG_FILE" value="$(find mw_global_planner)/custom_config.conf" if="$(arg debug)"/>
 
-  <node name="global_planner" type="global_planner_action_node" pkg="global_planner" output="$(arg output_log)" respawn="$(arg respawn)">
+  <node name="global_planner" type="global_planner_action_node" pkg="mw_global_planner" output="$(arg output_log)" respawn="$(arg respawn)">
     <rosparam command="load" file="$(find mowito_rosbot)/config/global_planner_config/global_planner_action_server_params.yaml"/>
   </node>
 </launch>