Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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

  • Loading branch information...
commit 9b806566d92e5c233efe091368332302f4b40e4b 2 parents f0c85b4 + 29cc452
André Kelpe authored August 21, 2010
19  COPYING.txt
... ...
@@ -0,0 +1,19 @@
  1
+Copyright (c) 2010 André Kelpe
  2
+
  3
+Permission is hereby granted, free of charge, to any person obtaining a copy
  4
+of this software and associated documentation files (the "Software"), to deal
  5
+in the Software without restriction, including without limitation the rights
  6
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  7
+copies of the Software, and to permit persons to whom the Software is
  8
+furnished to do so, subject to the following conditions:
  9
+
  10
+The above copyright notice and this permission notice shall be included in
  11
+all copies or substantial portions of the Software.
  12
+
  13
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  14
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  15
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  16
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  17
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  18
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  19
+THE SOFTWARE.
3  README.txt
@@ -13,7 +13,7 @@ two things:
13 13
 * it defines the ".talk" command which can be used by all admins of the bot to
14 14
   force to say custom things
15 15
 
16  
-The license of this module is GPLv3 [3]
  16
+The license of this module is the MIT license (see COPYING.txt)
17 17
 
18 18
 To patch phenny to be able to use the module download the latest phenny from
19 19
 [1] go into the toplevel directory and run:
@@ -37,4 +37,3 @@ Now all people configured as admins are able to use ".talk" command.
37 37
 [0] http://hackerspace.be/TheSilentGuy
38 38
 [1] http://inamidst.com/phenny/
39 39
 [2] http://espeak.sourceforge.net/
40  
-[3] http://www.gnu.org/licenses/gpl-3.0.html
2  src/silentguy.py
@@ -6,7 +6,7 @@
6 6
 http://github.com/fs111/TheSilentGuy
7 7
 
8 8
 Author: André Kelpe <efeshundertelf at googlemail dot com>
9  
-License: GPLv3
  9
+License: MIT
10 10
 
11 11
 """
12 12
 from subprocess import Popen, PIPE

0 notes on commit 9b80656

Please sign in to comment.
Something went wrong with that request. Please try again.