From d7ff4a371c74aacb696f3bb412cd80e0b7826f94 Mon Sep 17 00:00:00 2001 From: FrancescoUK Date: Fri, 7 Aug 2015 13:01:24 +0100 Subject: [PATCH] Fix to the License naming clash issue - Instead of LICENSE used COPYING (it's accepted see: http://www.theregister.co.uk/2013/04/18/github_licensing_study) - removed license.txt inside license dir to avoid unnecessary duplications or clash of license of the ospos code. COPYING is anyway a rename of LICENSE that was a newer version than the one in license/license.txt --- COPYING | 20 ++++++++++++++++++++ license/license.txt | 19 ------------------- 2 files changed, 20 insertions(+), 19 deletions(-) create mode 100644 COPYING delete mode 100644 license/license.txt diff --git a/COPYING b/COPYING new file mode 100644 index 000000000..4d5c26d40 --- /dev/null +++ b/COPYING @@ -0,0 +1,20 @@ +The MIT License (MIT) + +Copyright (c) 2014 pappastech + +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. \ No newline at end of file diff --git a/license/license.txt b/license/license.txt deleted file mode 100644 index 3c6b4410f..000000000 --- a/license/license.txt +++ /dev/null @@ -1,19 +0,0 @@ -Copyright (C) 2011 by Pappas Technologies, LLC - -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. \ No newline at end of file