Skip to content
Snippets Groups Projects
Unverified Commit 896f0b4a authored by Nadia Hammoudeh García's avatar Nadia Hammoudeh García Committed by GitHub
Browse files

Merge branch 'kinetic-devel' into mesh-brightness

parents 35af93cd 9084aa0b
Branches
No related merge requests found
......@@ -5,7 +5,7 @@
Drivers, description, and utilities for Universal Robot Arms.
</description>
<maintainer email="fxm@ipa.fhg.de">Felix Messmer</maintainer>
<maintainer email="nhg@ipa.fhg.de">Nadia Hammoudeh Garcia</maintainer>
<maintainer email="g.a.vanderhoorn@tudelft.nl">G.A. vd. Hoorn</maintainer>
<license>BSD</license>
......
......@@ -5,8 +5,8 @@
<description>
An automatically generated package with all the configuration and launch files for using the ur10 with the MoveIt Motion Planning Framework
</description>
<author email="fxm@ipa.fhg.de">Felix Messmer</author>
<maintainer email="fxm@ipa.fhg.de">Felix Messmer</maintainer>
<author>Felix Messmer</author>
<maintainer email="nhg@ipa.fhg.de">Nadia Hammoudeh Garcia</maintainer>
<maintainer email="g.a.vanderhoorn@tudelft.nl">G.A. vd. Hoorn</maintainer>
<license>BSD</license>
......
......@@ -5,8 +5,8 @@
<description>
An automatically generated package with all the configuration and launch files for using the ur3 with the MoveIt Motion Planning Framework
</description>
<author email="fxm@ipa.fhg.de">Felix Messmer</author>
<maintainer email="fxm@ipa.fhg.de">Felix Messmer</maintainer>
<author>Felix Messmer</author>
<maintainer email="nhg@ipa.fhg.de">Nadia Hammoudeh Garcia</maintainer>
<maintainer email="g.a.vanderhoorn@tudelft.nl">G.A. vd. Hoorn</maintainer>
<license>BSD</license>
......
......@@ -5,8 +5,8 @@
<description>
An automatically generated package with all the configuration and launch files for using the ur5 with the MoveIt Motion Planning Framework
</description>
<author email="fxm@ipa.fhg.de">Felix Messmer</author>
<maintainer email="fxm@ipa.fhg.de">Felix Messmer</maintainer>
<author>Felix Messmer</author>
<maintainer email="nhg@ipa.fhg.de">Nadia Hammoudeh Garcia</maintainer>
<maintainer email="g.a.vanderhoorn@tudelft.nl">G.A. vd. Hoorn</maintainer>
<license>BSD</license>
......
......@@ -5,9 +5,9 @@
<description>The ur_bringup package</description>
<author>Wim Meeussen</author>
<author email="sedwards@swri.org">Shaun Edwards</author>
<author email="fxm@ipa.fhg.de">Felix Messmer</author>
<maintainer email="fxm@ipa.fhg.de">Felix Messmer</maintainer>
<author>Shaun Edwards</author>
<author>Felix Messmer</author>
<maintainer email="nhg@ipa.fhg.de">Nadia Hammoudeh Garcia</maintainer>
<maintainer email="g.a.vanderhoorn@tudelft.nl">G.A. vd. Hoorn</maintainer>
<license>BSD</license>
......
......@@ -7,10 +7,10 @@
</description>
<author>Wim Meeussen</author>
<author email="kphawkins@gatech.edu">Kelsey Hawkins</author>
<author>Kelsey Hawkins</author>
<author>Mathias Ludtke</author>
<author email="fxm@ipa.fhg.de">Felix Messmer</author>
<maintainer email="fxm@ipa.fhg.de">Felix Messmer</maintainer>
<author>Felix Messmer</author>
<maintainer email="nhg@ipa.fhg.de">Nadia Hammoudeh Garcia</maintainer>
<maintainer email="g.a.vanderhoorn@tudelft.nl">G.A. vd. Hoorn</maintainer>
<license>BSD</license>
......
......@@ -7,9 +7,9 @@
</description>
<author>Stuart Glaser</author>
<author email="sedwards@swri.org">Shaun Edwards</author>
<author email="fxm@ipa.fhg.de">Felix Messmer</author>
<maintainer email="fxm@ipa.fhg.de">Felix Messmer</maintainer>
<author>Shaun Edwards</author>
<author>Felix Messmer</author>
<maintainer email="nhg@ipa.fhg.de">Nadia Hammoudeh Garcia</maintainer>
<maintainer email="g.a.vanderhoorn@tudelft.nl">G.A. vd. Hoorn</maintainer>
<license>BSD</license>
......
......@@ -8,9 +8,9 @@
<author>Alexander Bubeck</author>
<author email="sedwards@swri.org">Shaun Edwards</author>
<author email="fxm@ipa.fhg.de">Felix Messmer</author>
<maintainer email="fxm@ipa.fhg.de">Felix Messmer</maintainer>
<author>Shaun Edwards</author>
<author>Felix Messmer</author>
<maintainer email="nhg@ipa.fhg.de">Nadia Hammoudeh Garcia</maintainer>
<maintainer email="g.a.vanderhoorn@tudelft.nl">G.A. vd. Hoorn</maintainer>
<license>BSD</license>
......
......@@ -7,8 +7,8 @@
See http://hdl.handle.net/1853/50782 for details.
</description>
<author email="kphawkins@gatech.edu">Kelsey Hawkins</author>
<maintainer email="fxm@ipa.fhg.de">Felix Messmer</maintainer>
<author>Kelsey Hawkins</author>
<maintainer email="nhg@ipa.fhg.de">Nadia Hammoudeh Garcia</maintainer>
<maintainer email="g.a.vanderhoorn@tudelft.nl">G.A. vd. Hoorn</maintainer>
<license>BSD</license>
<url type="website">http://wiki.ros.org/ur_kinematics</url>
......
......@@ -4,9 +4,9 @@
<version>1.2.1</version>
<description>The ur_msgs package</description>
<author email="glusia@rpi.edu">Andrew Glusiec</author>
<author email="fxm@ipa.fhg.de">Felix Messmer</author>
<maintainer email="fxm@ipa.fhg.de">Felix Messmer</maintainer>
<author>Andrew Glusiec</author>
<author>Felix Messmer</author>
<maintainer email="nhg@ipa.fhg.de">Nadia Hammoudeh Garcia</maintainer>
<maintainer email="g.a.vanderhoorn@tudelft.nl">G.A. vd. Hoorn</maintainer>
<license>BSD</license>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment