X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=COPYING;h=c800310662ac848fbc0446de948055f64a1602da;hb=b22038a43a626915c6f70debf63f732053309a75;hp=7899637e127972f62d5bc0094fec2c4247eee947;hpb=0f3e302547363ea237454dda891ddb5de1be4476;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/COPYING b/COPYING
index 7899637e..c8003106 100644
--- a/COPYING
+++ b/COPYING
@@ -1,21 +1,8 @@
-Copyright (C) 2002 Tom Gilbert.
+rbot the Ruby IRC bot
 
-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:
+Copyright (C) 2007-2015 Giuseppe Bilotta and the rbot development team
 
-The above copyright notice and this permission notice shall be included in
-all copies of the Software and its documentation and acknowledgment shall be
-given in the documentation and software packages that this Software was
-used.
-
-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.
+This program is free software; you can redistribute it and/or modify it
+under the terms of the MIT license with acknolwedgement clause (see
+COPYING.rbot) or the GNU General Public License, version 2 (see GPLv2)