From: Erik Andresen <erik@vontaene.de>
Date: Sat, 18 Oct 2014 23:10:30 +0000 (+0200)
Subject: Merge branch 'master' of ssh://vontaene/home/erik_alt/git/arm_ros_conn
X-Git-Url: https://defiant.homedns.org/gitweb/?p=arm_ros_conn.git;a=commitdiff_plain;h=b4f1007066b11132d166134959db0a269d42e024;hp=-c

Merge branch 'master' of ssh://vontaene/home/erik_alt/git/arm_ros_conn

Conflicts:
	arm.launch
---

b4f1007066b11132d166134959db0a269d42e024
diff --combined arm.launch
index d63bd6a,9a353f2..b32d8be
--- a/arm.launch
+++ b/arm.launch
@@@ -1,10 -1,15 +1,10 @@@
  <?xml version="1.0"?>
  <launch>
- 	<include file="$(find arm)/launch/openni2.launch" />
+ 	<include file="$(find openni2_launch)/launch/openni2.launch" />
  
  	<node pkg="depthimage_to_laserscan" type="depthimage_to_laserscan" name="depthimage_to_laserscan" output="screen">
  		<remap from="image" to="/camera/depth/image_raw"/>
  		<remap from="camera_info" to="/camera/depth/camera_info"/>
  		<param name="output_frame_id" value="/scan" />
  	</node>
 -
 -	<!--
 -	<param name="robot_description" command="$(find xacro)/xacro.py $(find arm)/urdf/arm.urdf.xacro" />
 -	<node name="robot_state_publisher" pkg="robot_state_publisher" type="state_publisher" />
 --->
  </launch>