Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of /home/fs111/code/TheSilentGuy

  • Loading branch information...
commit 9b806566d92e5c233efe091368332302f4b40e4b 2 parents f0c85b4 + 29cc452
@fs111 authored
Showing with 21 additions and 3 deletions.
  1. +19 −0 COPYING.txt
  2. +1 −2  README.txt
  3. +1 −1  src/silentguy.py
View
19 COPYING.txt
@@ -0,0 +1,19 @@
+Copyright (c) 2010 André Kelpe
+
+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.
View
3  README.txt
@@ -13,7 +13,7 @@ two things:
* it defines the ".talk" command which can be used by all admins of the bot to
force to say custom things
-The license of this module is GPLv3 [3]
+The license of this module is the MIT license (see COPYING.txt)
To patch phenny to be able to use the module download the latest phenny from
[1] go into the toplevel directory and run:
@@ -37,4 +37,3 @@ Now all people configured as admins are able to use ".talk" command.
[0] http://hackerspace.be/TheSilentGuy
[1] http://inamidst.com/phenny/
[2] http://espeak.sourceforge.net/
-[3] http://www.gnu.org/licenses/gpl-3.0.html
View
2  src/silentguy.py
@@ -6,7 +6,7 @@
http://github.com/fs111/TheSilentGuy
Author: André Kelpe <efeshundertelf at googlemail dot com>
-License: GPLv3
+License: MIT
"""
from subprocess import Popen, PIPE
Please sign in to comment.
Something went wrong with that request. Please try again.