From 42a96fe9b055bb6ded968dc8af246b2b8fa3af93 Mon Sep 17 00:00:00 2001 From: Leon Keim <leon.keim@googlemail.com> Date: Wed, 10 Jul 2024 07:17:45 +0000 Subject: [PATCH] Merge branch 'authors-release-3-9' into 'master' Authors release 3 9 See merge request dumux-repositories/dumux-lecture!224 (cherry picked from commit 0415dd1850b58482c8be42b1cd898f37c1f57ab5) ca6197cf Update AUTHORS.md 2a5da45e Update README.md gpl 2 to 3 b8110bb9 Update README.md change to newer link for gpl Co-authored-by: Leon Keim <leon.keim@googlemail.com> --- AUTHORS.md | 13 +++++++------ README.md | 4 ++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index 3397cb56..71d32477 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -5,8 +5,8 @@ The DuMux Lecture contributors are | 2017-2018 | Sina Ackermann | | 2008-2012 | Katherina Baber | | 2015 | Martin Beck | -| 2022-2023 | Ivan Buntic | -| 2012-2021, 2023 | Holger Class | +| 2022-2024 | Ivan Buntic | +| 2012-2021, 2023-2024 | Holger Class | | 2018-2021 | Edward 'Ned' Coltman | | 2012-2013 | Melanie Darcis | | 2018-2020 | Simon Emmert | @@ -17,10 +17,11 @@ The DuMux Lecture contributors are | 2016-2020, 2022 | Katharina Heck | | 2015-2016, 2019 | Johannes Hommel | | 2012 | Johannes Irtenkauf | -| 2020, 2022-2023 | Mathis Kelm | +| 2024 | Leon Keim | +| 2020, 2022-2024 | Mathis Kelm | | 2021-2022 | Stefanie Kiemle | | 2014 | Alexander Kissinger | -| 2015-2023 | Timo Koch | +| 2015-2024 | Timo Koch | | 2018 | Melanie Lipp | | 2011 | Andreas Lauser | | 2023 | Hamza Oukili | @@ -29,9 +30,9 @@ The DuMux Lecture contributors are | 2018-2020, 2022 | Theresa Schollenberger | | 2012-2015 | Nicolas Schwenck | | 2018 | Gabriele Seitz | -| 2020 | Maziar Veyskarami | +| 2020,2024 | Maziar Veyskarami | | 2012-2014 | Lena Walter | -| 2022 | Yue Wang | +| 2022, 2024 | Yue Wang | | 2020 | Felix Weinhardt | | 2015-2020 | Kilian Weishaupt | | 2018 | Kai Wendel | diff --git a/README.md b/README.md index 2746f2ee..338ab962 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ License ------- DuMuX-Lecture is licensed under the terms and conditions of the GNU -General Public License (GPL) version 2 or - at your option - any later +General Public License (GPL) version 3 or - at your option - any later version. The [GPL can be read online][2], or in the `LICENSE.md` file provided in the topmost directory of the DuMuX source code tree. @@ -52,4 +52,4 @@ make -j8 build_tests && ctest -j8 [0]: http://dumux.org [1]: http://www.hydrosys.uni-stuttgart.de/index.en.php -[2]: http://www.gnu.org/licenses/old-licenses/gpl-2.0.html +[2]: https://www.gnu.org/licenses/gpl-3.0.en.html -- GitLab