Skip to content

Commit

Permalink
Merge pull request #757 from ipab-slmc/topic/update-email-address
Browse files Browse the repository at this point in the history
Update email addresses
  • Loading branch information
wxmerkt authored May 26, 2024
2 parents 2b613f6 + b5709c9 commit 7629f73
Show file tree
Hide file tree
Showing 22 changed files with 33 additions and 38 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
<version>6.2.0</version>
<description>Cartpole dynamics solver plug-in for Exotica</description>

<maintainer email="[email protected]">Traiko Dinev</maintainer>
<maintainer email="[email protected]">Wolfgang Merkt</maintainer>
<maintainer email="[email protected]">Wolfgang Merkt</maintainer>
<author>Traiko Dinev</author>
<license>BSD</license>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<version>6.2.0</version>
<description>Double integrator dynamics solver plug-in for Exotica</description>

<maintainer email="[email protected]">Wolfgang Merkt</maintainer>
<maintainer email="[email protected]">Wolfgang Merkt</maintainer>
<license>BSD</license>

<buildtool_depend>catkin</buildtool_depend>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<name>exotica_dynamics_solvers</name>
<version>6.2.0</version>
<description>Metapackage for all dynamics solvers bundled with core EXOTica.</description>
<maintainer email="[email protected]">Wolfgang Merkt</maintainer>
<maintainer email="[email protected]">Wolfgang Merkt</maintainer>
<license>BSD</license>
<buildtool_depend>catkin</buildtool_depend>
<exec_depend>exotica_cartpole_dynamics_solver</exec_depend>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
<version>6.2.0</version>
<description>Pendulum dynamics solver plug-in for Exotica</description>

<maintainer email="[email protected]">Traiko Dinev</maintainer>
<maintainer email="[email protected]">Wolfgang Merkt</maintainer>
<maintainer email="[email protected]">Wolfgang Merkt</maintainer>
<author>Traiko Dinev</author>
<license>BSD</license>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<version>6.2.0</version>
<description>Dynamics solver plug-in using Pinocchio for Exotica</description>

<maintainer email="[email protected]">Wolfgang Merkt</maintainer>
<maintainer email="[email protected]">Wolfgang Merkt</maintainer>
<license>BSD</license>

<buildtool_depend>catkin</buildtool_depend>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<version>6.2.0</version>
<description>Quadrotor dynamics solver plug-in for Exotica</description>

<maintainer email="[email protected]">Wolfgang Merkt</maintainer>
<maintainer email="[email protected]">Wolfgang Merkt</maintainer>
<license>BSD</license>

<buildtool_depend>catkin</buildtool_depend>
Expand Down
4 changes: 2 additions & 2 deletions exotations/exotica_collision_scene_fcl_latest/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<name>exotica_collision_scene_fcl_latest</name>
<version>6.2.0</version>
<description>Collision checking and distance computation using the latest version of the FCL library.</description>
<maintainer email="[email protected]">Wolfgang Merkt</maintainer>
<maintainer email="v.ivan@ed.ac.uk">Vladimir Ivan</maintainer>
<maintainer email="[email protected]">Wolfgang Merkt</maintainer>
<maintainer email="v.ivan[email protected]">Vladimir Ivan</maintainer>

<license>BSD</license>

Expand Down
4 changes: 2 additions & 2 deletions exotations/exotica_core_task_maps/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<version>6.2.0</version>
<description>Common taskmaps provided with EXOTica.</description>

<maintainer email="v.ivan@ed.ac.uk">Vladimir Ivan</maintainer>
<maintainer email="[email protected]">Wolfgang Merkt</maintainer>
<maintainer email="v.ivan[email protected]">Vladimir Ivan</maintainer>
<maintainer email="[email protected]">Wolfgang Merkt</maintainer>

<author>Yiming Yang</author>
<author>Michael Camilleri</author>
Expand Down
4 changes: 2 additions & 2 deletions exotations/solvers/exotica_aico_solver/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<version>6.2.0</version>
<description>Implementation of the Approximate Inference Control algorithm (AICO)</description>

<maintainer email="v.ivan@ed.ac.uk">Vladimir Ivan</maintainer>
<maintainer email="[email protected]">Wolfgang Merkt</maintainer>
<maintainer email="v.ivan[email protected]">Vladimir Ivan</maintainer>
<maintainer email="[email protected]">Wolfgang Merkt</maintainer>

<license>BSD</license>

Expand Down
3 changes: 1 addition & 2 deletions exotations/solvers/exotica_ddp_solver/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
<version>6.2.0</version>
<description>Various DDP Solvers</description>

<maintainer email="[email protected]">Traiko Dinev</maintainer>
<maintainer email="[email protected]">Wolfgang Merkt</maintainer>
<maintainer email="[email protected]">Wolfgang Merkt</maintainer>
<author>Traiko Dinev</author>

<license>BSD</license>
Expand Down
4 changes: 2 additions & 2 deletions exotations/solvers/exotica_ik_solver/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<version>6.2.0</version>
<description>Regularised and weighted pseudo-inverse unconstrained end-pose solver</description>

<maintainer email="[email protected]">Wolfgang Merkt</maintainer>
<maintainer email="v.ivan@ed.ac.uk">Vladimir Ivan</maintainer>
<maintainer email="[email protected]">Wolfgang Merkt</maintainer>
<maintainer email="v.ivan[email protected]">Vladimir Ivan</maintainer>

<license>BSD</license>

Expand Down
3 changes: 1 addition & 2 deletions exotations/solvers/exotica_ilqg_solver/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
<version>6.2.0</version>
<description>ILQG Solver (Todorov and Li, 2004)</description>

<maintainer email="[email protected]">Traiko Dinev</maintainer>
<maintainer email="[email protected]">Wolfgang Merkt</maintainer>
<maintainer email="[email protected]">Wolfgang Merkt</maintainer>
<author>Traiko Dinev</author>

<license>BSD</license>
Expand Down
3 changes: 1 addition & 2 deletions exotations/solvers/exotica_ilqr_solver/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
<version>6.2.0</version>
<description>ILQR Solver (Li and Todorov, 2004)</description>

<maintainer email="[email protected]">Traiko Dinev</maintainer>
<maintainer email="[email protected]">Wolfgang Merkt</maintainer>
<maintainer email="[email protected]">Wolfgang Merkt</maintainer>
<author>Traiko Dinev</author>

<license>BSD</license>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
<version>6.2.0</version>
<description>A Levenberg-Marquardt solver for EXOTica</description>

<maintainer email="[email protected]">Christian Rauch</maintainer>
<maintainer email="[email protected]">Wolfgang Merkt</maintainer>
<author>Christian Rauch</author>

<license>MIT</license>

Expand Down
3 changes: 1 addition & 2 deletions exotations/solvers/exotica_ompl_control_solver/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
<version>6.2.0</version>
<description>Kinodynamic Control Solvers from OMPL</description>

<maintainer email="[email protected]">Traiko Dinev</maintainer>
<maintainer email="[email protected]">Wolfgang Merkt</maintainer>
<maintainer email="[email protected]">Wolfgang Merkt</maintainer>
<author>Traiko Dinev</author>

<license>BSD</license>
Expand Down
2 changes: 1 addition & 1 deletion exotations/solvers/exotica_ompl_solver/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<name>exotica_ompl_solver</name>
<version>6.2.0</version>
<description>Exotica solvers based on the Open Motion Planning Libary (OMPL)</description>
<maintainer email="[email protected]">Wolfgang Merkt</maintainer>
<maintainer email="[email protected]">Wolfgang Merkt</maintainer>
<author>Yiming Yang</author>

<license>BSD</license>
Expand Down
2 changes: 1 addition & 1 deletion exotations/solvers/exotica_scipy_solver/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<version>6.2.0</version>
<description>SciPy-based Python solvers for Exotica</description>

<maintainer email="[email protected]">Wolfgang Merkt</maintainer>
<maintainer email="[email protected]">Wolfgang Merkt</maintainer>
<author>Wolfgang Merkt</author>

<license>BSD</license>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<name>exotica_time_indexed_rrt_connect_solver</name>
<version>6.2.0</version>
<description>Time-Indexed RRT-Connect solver (Humanoids 2018)</description>
<maintainer email="[email protected]">Wolfgang Merkt</maintainer>
<maintainer email="[email protected]">Wolfgang Merkt</maintainer>
<author>Yiming Yang</author>

<license>BSD</license>
Expand Down
8 changes: 4 additions & 4 deletions exotica/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
<version>6.2.0</version>
<description>The Extensible Optimization Toolset (EXOTica) is a library for defining problems for robot motion planning. This package serves similar to a metapackage and contains dependencies onto all core-released exotica packages. It also builds the documentation.</description>

<maintainer email="v.ivan@ed.ac.uk">Vladimir Ivan</maintainer>
<maintainer email="[email protected]">Wolfgang Merkt</maintainer>
<maintainer email="v.ivan[email protected]">Vladimir Ivan</maintainer>
<maintainer email="[email protected]">Wolfgang Merkt</maintainer>

<author email="v.ivan@ed.ac.uk">Vladimir Ivan</author>
<author email="[email protected]">Wolfgang Merkt</author>
<author email="v.ivan[email protected]">Vladimir Ivan</author>
<author email="[email protected]">Wolfgang Merkt</author>
<author>Christian Rauch</author>
<author>Christopher E. Mower</author>
<author>Yiming Yang</author>
Expand Down
4 changes: 2 additions & 2 deletions exotica_core/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<version>6.2.0</version>
<description>The Extensible Optimization Toolset (EXOTica) is a library for defining problems for robot motion planning.</description>

<maintainer email="v.ivan@ed.ac.uk">Vladimir Ivan</maintainer>
<maintainer email="[email protected]">Wolfgang Merkt</maintainer>
<maintainer email="v.ivan[email protected]">Vladimir Ivan</maintainer>
<maintainer email="[email protected]">Wolfgang Merkt</maintainer>
<author>Yiming Yang</author>
<author>Michael Camilleri</author>

Expand Down
4 changes: 2 additions & 2 deletions exotica_examples/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<version>6.2.0</version>
<description>Package containing examples and system tests for EXOTica.</description>

<maintainer email="v.ivan@ed.ac.uk">Vladimir Ivan</maintainer>
<maintainer email="[email protected]">Wolfgang Merkt</maintainer>
<maintainer email="v.ivan[email protected]">Vladimir Ivan</maintainer>
<maintainer email="[email protected]">Wolfgang Merkt</maintainer>

<license>BSD</license>
<url type="website">https://github.com/ipab-slmc/exotica</url>
Expand Down
4 changes: 2 additions & 2 deletions exotica_python/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<name>exotica_python</name>
<version>6.2.0</version>
<description>Python bindings for EXOTica</description>
<maintainer email="[email protected]">Wolfgang Merkt</maintainer>
<maintainer email="v.ivan@ed.ac.uk">Vladimir Ivan</maintainer>
<maintainer email="[email protected]">Wolfgang Merkt</maintainer>
<maintainer email="v.ivan[email protected]">Vladimir Ivan</maintainer>
<license>BSD</license>
<buildtool_depend>catkin</buildtool_depend>
<depend>exotica_core</depend>
Expand Down

0 comments on commit 7629f73

Please sign in to comment.