From 84704591c971dc23833ee7f356611ff42af3da30 Mon Sep 17 00:00:00 2001 From: Sergiusz Bazanski Date: Sat, 27 Jul 2019 02:37:55 +0200 Subject: [PATCH 1/3] License under MIT. All authors will be required to +1 on the MR for this commit. --- COPYING | 23 +++++++++++++++++++++++ README.md | 4 ++++ 2 files changed, 27 insertions(+) create mode 100644 COPYING diff --git a/COPYING b/COPYING new file mode 100644 index 00000000..f42b7ab2 --- /dev/null +++ b/COPYING @@ -0,0 +1,23 @@ +Copyright 2019 Adrian +Copyright 2019 Anne Jan Brouwer +Copyright 2019 Anton Weber +Copyright 2019 ch3 +Copyright 2019 Dirk Jäckel +Copyright 2019 Gerd +Copyright 2019 Gerd Sattler +Copyright 2019 Hauke Mehrtens +Copyright 2019 madonius +Copyright 2019 Mot +Copyright 2019 Ole Dreessen +Copyright 2019 q3k +Copyright 2019 Rahix +Copyright 2019 schneider +Copyright 2019 schneider +Copyright 2019 swym <0xfd000000@gmail.com> +Copyright 2019 wink + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/README.md b/README.md index f1e790c0..1097e464 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,10 @@ Flasing with or without a debugger is described in detail in [How To Flash](http ## Debugger If you have a debugger, head over to our [Debugger](https://firmware.card10.badge.events.ccc.de/debugger.html) page to learn how to use it. +# License + +Unless otherwise noted in a file, the contents of this repository are licensed under the MIT license. See [COPYING](COPYING) for more details. + --- # Old README Contents: -- GitLab From 8e84f94296809d791dd252536ec86b94803592da Mon Sep 17 00:00:00 2001 From: Sergiusz Bazanski Date: Sat, 27 Jul 2019 02:41:43 +0200 Subject: [PATCH 2/3] COPYING: unify schneider, Gerd Sattler contacts --- COPYING | 2 -- 1 file changed, 2 deletions(-) diff --git a/COPYING b/COPYING index f42b7ab2..d9027b09 100644 --- a/COPYING +++ b/COPYING @@ -3,7 +3,6 @@ Copyright 2019 Anne Jan Brouwer Copyright 2019 Anton Weber Copyright 2019 ch3 Copyright 2019 Dirk Jäckel -Copyright 2019 Gerd Copyright 2019 Gerd Sattler Copyright 2019 Hauke Mehrtens Copyright 2019 madonius @@ -12,7 +11,6 @@ Copyright 2019 Ole Dreessen Copyright 2019 q3k Copyright 2019 Rahix Copyright 2019 schneider -Copyright 2019 schneider Copyright 2019 swym <0xfd000000@gmail.com> Copyright 2019 wink -- GitLab From 1fe3638c688c3be96039708a5c0757aba132b415 Mon Sep 17 00:00:00 2001 From: Sergiusz Bazanski Date: Sat, 27 Jul 2019 15:18:37 +0200 Subject: [PATCH 3/3] COPYING: move to collective copyright notice --- COPYING | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/COPYING b/COPYING index d9027b09..b039d415 100644 --- a/COPYING +++ b/COPYING @@ -1,18 +1,4 @@ -Copyright 2019 Adrian -Copyright 2019 Anne Jan Brouwer -Copyright 2019 Anton Weber -Copyright 2019 ch3 -Copyright 2019 Dirk Jäckel -Copyright 2019 Gerd Sattler -Copyright 2019 Hauke Mehrtens -Copyright 2019 madonius -Copyright 2019 Mot -Copyright 2019 Ole Dreessen -Copyright 2019 q3k -Copyright 2019 Rahix -Copyright 2019 schneider -Copyright 2019 swym <0xfd000000@gmail.com> -Copyright 2019 wink +Copyright 2019 card10-firmware contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -- GitLab