From: Conny Sjöblom Date: Wed, 5 Feb 2014 20:44:55 +0000 (+0200) Subject: Merge branch 'master' of kronos.jfr.im:erebus X-Git-Url: https://jfr.im/git/erebus.git/commitdiff_plain/e659feb5010053f05070be17ecfef36e9ee138ba?hp=233f40c362e09bb8e7dda953d51c38409d4fdd5a Merge branch 'master' of kronos.jfr.im:erebus --- diff --git a/COPYING b/COPYING index ae2d6d3..d526ac9 100644 --- a/COPYING +++ b/COPYING @@ -1,19 +1,26 @@ -Copyright (c) 2014, John Runyon and Conny Sjoblom +Team: John Runyon and Conny Sjoblom -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: +This is free and unencumbered software released into the public domain. -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. +Anyone is free to copy, modify, publish, use, compile, sell, or +distribute this software, either in source code form or as a compiled +binary, for any purpose, commercial or non-commercial, and by any +means. -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. +In jurisdictions that recognize copyright laws, the author or authors +of this software dedicate any and all copyright interest in the +software to the public domain. We make this dedication for the benefit +of the public at large and to the detriment of our heirs and +successors. We intend this dedication to be an overt act of +relinquishment in perpetuity of all present and future rights to this +software under copyright law. + +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 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. + +For more information, please refer to diff --git a/modules/eval.py b/modules/eval.py index 6e19282..7536198 100644 --- a/modules/eval.py +++ b/modules/eval.py @@ -1,9 +1,10 @@ -# Erebus IRC bot - Author: John Runyon +# Erebus IRC bot - Author: Erebus Team # !EVAL and !EXEC commands +# This file is released into the public domain; see http://unlicense.org/ # module info modinfo = { - 'author': 'John Runyon (DimeCadmium)', + 'author': 'Erebus Team', 'license': 'public domain', 'compatible': [1], 'depends': [], diff --git a/modules/foo.py b/modules/foo.py index f2a394a..8063afb 100644 --- a/modules/foo.py +++ b/modules/foo.py @@ -1,10 +1,10 @@ -# Erebus IRC bot - Author: John Runyon +# Erebus IRC bot - Author: Erebus Team # simple module example # This file is released into the public domain; see http://unlicense.org/ # module info modinfo = { - 'author': 'John Runyon (DimeCadmium)', + 'author': 'Erebus Team', 'license': 'public domain', 'compatible': [1], # compatible module API versions 'depends': [], # other modules required to work properly? diff --git a/modules/module.py b/modules/module.py index 8a2989c..33be1ff 100644 --- a/modules/module.py +++ b/modules/module.py @@ -1,10 +1,10 @@ -# Erebus IRC bot - Author: John Runyon +# Erebus IRC bot - Author: Erebus Team # module control through irc # This file is released into the public domain; see http://unlicense.org/ # module info modinfo = { - 'author': 'John Runyon (DimeCadmium)', + 'author': 'Erebus Team', 'license': 'public domain', 'compatible': [1], # compatible module API versions 'depends': [], # other modules required to work properly? diff --git a/modules/spotify.py b/modules/spotify.py index fe4e037..9ee323e 100644 --- a/modules/spotify.py +++ b/modules/spotify.py @@ -1,10 +1,10 @@ -# Erebus IRC bot - Author: Conny Sjoblom +# Erebus IRC bot - Author: Erebus Team # Spotify URL Checker # This file is released into the public domain; see http://unlicense.org/ # module info modinfo = { - 'author': 'Conny Sjoblom', + 'author': 'Erebus Team', 'license': 'public domain', 'compatible': [1], # compatible module API versions 'depends': [], # other modules required to work properly? diff --git a/modules/twitch.py b/modules/twitch.py index c083857..ba7e81f 100644 --- a/modules/twitch.py +++ b/modules/twitch.py @@ -1,10 +1,10 @@ -# Erebus IRC bot - Author: Conny Sjoblom +# Erebus IRC bot - Author: Erebus Team # Twitch URL Checker # This file is released into the public domain; see http://unlicense.org/ # module info modinfo = { - 'author': 'Conny Sjoblom', + 'author': 'Erebus Team', 'license': 'public domain', 'compatible': [1], # compatible module API versions 'depends': [], # other modules required to work properly? diff --git a/modules/youtube.py b/modules/youtube.py index 639e32f..c40bf17 100644 --- a/modules/youtube.py +++ b/modules/youtube.py @@ -1,10 +1,10 @@ -# Erebus IRC bot - Author: Conny Sjoblom +# Erebus IRC bot - Author: Erebus Team # Youtube URL Checker # This file is released into the public domain; see http://unlicense.org/ # module info modinfo = { - 'author': 'Conny Sjoblom', + 'author': 'Erebus Team', 'license': 'public domain', 'compatible': [1], # compatible module API versions 'depends': [], # other modules required to work properly?