Skip to content
Snippets Groups Projects
Commit 7d428c8f authored by Bernd Flemisch's avatar Bernd Flemisch
Browse files

Merge branch 'feature/simplify-license-file' into 'master' 

[license][authors] Simplify LICENSE.md file to only contain license

See merge request !3347
parents 87f8097c 0716fa29
No related branches found
No related tags found
1 merge request!3347[license][authors] Simplify LICENSE.md file to only contain license
Pipeline #24692 passed
Stage: check-status
    Hide whitespace changes
    Inline Side-by-side
    AUTHORS.md 0 → 100644
    + 75
    − 0
    View file @ 7d428c8f
    | Year | Name |
    |------------|----------------------------|
    | 2016-2022 | Sina Ackermann |
    | 2010-2014 | Katherina Baber |
    | 2015-2018 | Martin Beck |
    | 2013-2021 | Beatrix Becker |
    | 2014 | Markus Blatt |
    | 2010 | Felix Bode |
    | 2020-2022 | Ivan Buntic |
    | 2018-2021 | Samuel Burbulla |
    | 2007-2011 | Yufei Cao |
    | 2018-2022 | Edward 'Ned' Coltman |
    | 2011-2020 | Holger Class |
    | 2008-2013 | Melanie Darcis |
    | 2008-2009 | Onur Dogan |
    | 2015-2022 | Simon Emmert |
    | 2009-2011 | Karin Erbertseder |
    | 2009-2014 | Benjamin Faigle |
    | 2013-2018 | Thomas Fetzer |
    | 2007-2022 | Bernd Flemisch |
    | 2007-2010 | Jochen Fritz |
    | 2015-2016 | Georg Futter |
    | 2015-2022 | Dennis Gläser |
    | 2012-2022 | Christoph Grüninger |
    | 2016-2022 | Katharina Heck |
    | 2017 | Rainer Helmig |
    | 2015-2022 | Johannes Hommel |
    | 2012-2015 | Vishal Jambhekar |
    | 2013-2014 | Muhammad Adil Javed |
    | 2012-2017 | Alexander Kissinger |
    | 2013-2022 | Timo Koch |
    | 2020-2021 | Tim Jupe |
    | 2020-2022 | Mathis Kelm |
    | 2022 | Leon Keim |
    | 2017 | Kata Kurgyis |
    | 2018-2022 | Theresa Schollenberger |
    | 2008-2012 | Andreas Lauser |
    | 2018 | Giuliano Lombardo |
    | 2018-2022 | Melanie Lipp |
    | 2018-2022 | Farid Mohammadi |
    | 2008-2014 | Klaus Mosthaf |
    | 2009-2014 | Philipp Nuske |
    | 2014 | Mirka Papenheim |
    | 2021-2022 | Dmitry Pavlov |
    | 2021 | Frank Platzek |
    | 2013-2014 | Dominik Riesterer |
    | 2008 | Irina Rybak |
    | 2019-2020 | Samuel Scherrer |
    | 2013-2022 | Martin Schneider |
    | 2009 | Anneli Schöniger |
    | 2015-2016 | Natalie Schröder |
    | 2010-2016 | Nicolas Schwenck |
    | 2015-2021 | Gabriele Seitz |
    | 2018 | Lincoln Sherpa |
    | 2011 | Michael Sinsbeck |
    | 2010,2019-2022 | Leopold Stadler |
    | 2012-2014 | Alexandru Tatomir |
    | 2013 | Katharina Türk |
    | 2018-2022 | Martin Utz |
    | 2015-2017 | Larissa de Vries |
    | 2019 | Andrea Vescovini |
    | 2020-2022 | Maziar Veyskarami |
    | 2010-2014 | Lena Walter |
    | 2020-2022 | Yue Wang |
    | 2018-2022 | Felix Weinhardt |
    | 2015-2022 | Kilian Weishaupt |
    | 2022 | Kai Wendel |
    | 2010-2011,2022 | David Werner |
    | 2019-2022 | Roman Winter |
    | 2015 | Hao Wu |
    | 2020-2022 | Hanchuan Wu |
    | 2008-2013 | Markus Wolff |
    | 2013 | Tianyuan Zheng |
    | 2021-2022 | Larissa Brencher |
    | 2021-2022 | Stefanie Kiemle |
    LICENSE.md
    + 0
    − 102
    View file @ 7d428c8f
    Licensing Information
    =====================
    Copyright holders
    -----------------
    | Year | Name |
    |------------|----------------------------|
    | 2016-2022 | Sina Ackermann |
    | 2010-2014 | Katherina Baber |
    | 2015-2018 | Martin Beck |
    | 2013-2021 | Beatrix Becker |
    | 2014 | Markus Blatt |
    | 2010 | Felix Bode |
    | 2020-2022 | Ivan Buntic |
    | 2018-2021 | Samuel Burbulla |
    | 2007-2011 | Yufei Cao |
    | 2018-2022 | Edward 'Ned' Coltman |
    | 2011-2020 | Holger Class |
    | 2008-2013 | Melanie Darcis |
    | 2008-2009 | Onur Dogan |
    | 2015-2022 | Simon Emmert |
    | 2009-2011 | Karin Erbertseder |
    | 2009-2014 | Benjamin Faigle |
    | 2013-2018 | Thomas Fetzer |
    | 2007-2022 | Bernd Flemisch |
    | 2007-2010 | Jochen Fritz |
    | 2015-2016 | Georg Futter |
    | 2015-2022 | Dennis Gläser |
    | 2012-2022 | Christoph Grüninger |
    | 2016-2022 | Katharina Heck |
    | 2017 | Rainer Helmig |
    | 2015-2022 | Johannes Hommel |
    | 2012-2015 | Vishal Jambhekar |
    | 2013-2014 | Muhammad Adil Javed |
    | 2012-2017 | Alexander Kissinger |
    | 2013-2022 | Timo Koch |
    | 2020-2021 | Tim Jupe |
    | 2020-2022 | Mathis Kelm |
    | 2022 | Leon Keim |
    | 2017 | Kata Kurgyis |
    | 2018-2022 | Theresa Schollenberger |
    | 2008-2012 | Andreas Lauser |
    | 2018 | Giuliano Lombardo |
    | 2018-2022 | Melanie Lipp |
    | 2018-2022 | Farid Mohammadi |
    | 2008-2014 | Klaus Mosthaf |
    | 2009-2014 | Philipp Nuske |
    | 2014 | Mirka Papenheim |
    | 2021-2022 | Dmitry Pavlov |
    | 2021 | Frank Platzek |
    | 2013-2014 | Dominik Riesterer |
    | 2008 | Irina Rybak |
    | 2019-2020 | Samuel Scherrer |
    | 2013-2022 | Martin Schneider |
    | 2009 | Anneli Schöniger |
    | 2015-2016 | Natalie Schröder |
    | 2010-2016 | Nicolas Schwenck |
    | 2015-2021 | Gabriele Seitz |
    | 2018 | Lincoln Sherpa |
    | 2011 | Michael Sinsbeck |
    | 2010,2019-2022 | Leopold Stadler |
    | 2012-2014 | Alexandru Tatomir |
    | 2013 | Katharina Türk |
    | 2018-2022 | Martin Utz |
    | 2015-2017 | Larissa de Vries |
    | 2019 | Andrea Vescovini |
    | 2020-2022 | Maziar Veyskarami |
    | 2010-2014 | Lena Walter |
    | 2020-2022 | Yue Wang |
    | 2018-2022 | Felix Weinhardt |
    | 2015-2022 | Kilian Weishaupt |
    | 2022 | Kai Wendel |
    | 2010-2011,2022 | David Werner |
    | 2019-2022 | Roman Winter |
    | 2015 | Hao Wu |
    | 2020-2022 | Hanchuan Wu |
    | 2008-2013 | Markus Wolff |
    | 2013 | Tianyuan Zheng |
    | 2021-2022 | Larissa Brencher |
    | 2021-2022 | Stefanie Kiemle |
    License
    -------
    DuMu<sup>x</sup> is licensed under the terms and conditions of the GNU General
    Public License (GPL) version 3 or - at your option - any later
    version. The GPL can be read [online][0], or below.
    Please note that DuMu<sup>x</sup>' license, unlike DUNE's, does NOT feature a
    template exception to the GNU General Public License. This means that
    you must publish any source code which uses any of the DuMu<sup>x</sup> header
    files if you want to redistribute your program to third parties. If
    this is unacceptable to you, please [contact us][1] for a commercial license.
    [0]: https://www.gnu.org/licenses/gpl-3.0.en.html
    [1]: http://www.hydrosys.uni-stuttgart.de/index.en.php
    Complete License Text
    ---------------------
    ### GNU GENERAL PUBLIC LICENSE
    Version 3, 29 June 2007
    ......
    README.md
    + 4
    − 1
    View file @ 7d428c8f
    ......@@ -53,7 +53,10 @@ files if you want to redistribute your program to third parties. If
    this is unacceptable to you, please [contact us][6] for a commercial
    license.
    See the file [LICENSE.md](LICENSE.md) for full copying permissions.
    See the file [LICENSE.md](LICENSE.md) for copying permissions.
    For a curated list of contributors see [AUTHORS.md](AUTHORS.md).
    If you notice that a contributor is missing on the list,
    please [contact us][6] or open a merge request adding the name.
    How to cite
    ============
    ......
    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