From 660ae31b8a19504c5ed1c827e81e61dec1a37147 Mon Sep 17 00:00:00 2001 From: Timm Linder Date: Thu, 8 Jun 2017 23:45:29 +0200 Subject: [PATCH 1/2] Updated AUTHORS list, adding Marc as contributor, mention ILIAD project --- AUTHORS | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index 21cdabdc..18ebba15 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,5 +1,9 @@ -The spencer_people_tracking framework was developed in the context of the EU FP7 research project SPENCER. +The spencer_people_tracking framework was developed in the context of the EU FP7 research project SPENCER, +and is being extended in the context of the EU H2020 research and innovation action ILIAD. + This work has been partly supported by the European Commission under contract number FP7-ICT-600877. +This work has received funding from the European Union’s Horizon 2020 research and innovation programme +under grant agreement No. 732737 (ILIAD). The framework was initially created and is being maintained by: @@ -14,5 +18,6 @@ We are also very thankful to the following additional contributors: Fabian Girrbach João Avelino Kota Weaver + Marc Hanheide ...and anybody who we, by accident, forgot to mention here! From 55842528e57666d7ebc6080e5fdaacd28b704250 Mon Sep 17 00:00:00 2001 From: Timm Linder Date: Thu, 8 Jun 2017 23:50:01 +0200 Subject: [PATCH 2/2] Update README --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 38a9b551..fab6a00c 100644 --- a/README.md +++ b/README.md @@ -264,9 +264,10 @@ The software in this repository is maintained by: - [Timm Linder](http://www.timmlinder.com), Social Robotics Lab, Albert-Ludwigs-Universität Freiburg - [Stefan Breuers](http://www.vision.rwth-aachen.de/people/stefan-breuers), Computer Vision Group, RWTH Aachen University -Credits of the different ROS packages go to the particular authors listed in the respective `README.md` and `package.xml` files. +Credits of the different ROS packages go to the particular authors listed in the respective `README.md` and `package.xml` files. See also the `AUTHORS.md` file for a list of further contributors. + +This work has been supported by the European Commission under contract number FP7-ICT-600877 (SPENCER), and has received additional funding from the European Union's Horizon 2020 research and innovation programme under grant agreement No 732737 (ILIAD). -This work has been supported by the EC under contract number FP7-ICT-600877 (SPENCER). If you use the software contained in this repository for your research, please cite the following publication: > On Multi-Modal People Tracking from Mobile Platforms in Very Crowded and Dynamic Environments