diff options
author | Jörg Frings-Fürst <debian@jff.email> | 2018-12-21 11:24:19 +0100 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff.email> | 2018-12-21 11:24:19 +0100 |
commit | 3a7ff53d6e4cfdc053f4fe1937aa1ba9378a043e (patch) | |
tree | 2f3cfbd571cc2401b03d9c65c1289f54b3e23988 /README.md | |
parent | 5f093bc9519f8c29e4400819a58cc268c2e93e73 (diff) | |
parent | 85d7cf6cf5adb4ce515e03719566e1f494dfc0aa (diff) |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'README.md')
-rw-r--r-- | README.md | 27 |
1 files changed, 20 insertions, 7 deletions
@@ -34,10 +34,23 @@ If you can’t afford the time to do the stuff mentioned above, but still want t ## License -Copyright (C) 2011-2017 Simon Schneegans <code@simonschneegans.de> - -This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. +Copyright 2011-2018 Simon Schneegans <code@simonschneegans.de> + +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. |