X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2FCOPYING;h=2330788ca7033afd1f65e0e558419f6ab36c6786;hb=HEAD;hp=015d29a1238f5f690bd233a2eebff4046af154b3;hpb=29dc83a8cc10b718f31a92f844086adffcc967fe;p=citadel.git

diff --git a/webcit/COPYING b/webcit/COPYING
index 015d29a12..2330788ca 100644
--- a/webcit/COPYING
+++ b/webcit/COPYING
@@ -1,4 +1,4 @@
-Webcit Core is Copyright by the Citadel Development Team 1998 - 2009
+Webcit Core is Copyright by the Citadel Development Team 1998 - 2012
 Webcit contains components under different Licenses, here their authors and list:
 
 Scriptaculous:Copyright (c) 2005-2007 
@@ -6,18 +6,34 @@ Scriptaculous:Copyright (c) 2005-2007
 	      (http://script.aculo.us, http://mir.aculo.us, http://blogs.law.harvard.edu/ivan, 
  	      http://www.tirsen.com, http://www.oriontransfer.co.nz) 
 	      MIT-style license.
+
 PrototypeJS: Copyright (c) 2005-2008 Sam Stephenson; http://www.prototypejs.org/; 
   MIT License (http://dev.rubyonrails.org/browser/spinoffs/prototype/trunk/LICENSE?format=raw)
+
 strcmp: http://kevin.vanzonneveld.net; original by: Waldo Malqui Silva input by: Steve Hilder
   improved by: Kevin van Zonneveld (http://kevin.vanzonneveld.net) http://kevin.vanzonneveld.net
+
 DatePicker: widget using Prototype and Scriptaculous. (c) 2007 Mathieu Jondet <mathieu@eulerian.com> Eulerian Technologies
   DatePicker is freely distributable under the same terms as Prototype. -> 
+
 NanoTree: Martin Mouritzen. (martin@nano.dk) LGPL V3
+
 Bubble Tooltips: Alessandro Fulciniti (http://web-graphics.com) Public Domain, GPL V3 by Art Cancro
+
 StdExt: Copyright (c) 2005 Michael Schuerig http://www.schuerig.de/michael/javascript/stdext.js LGPL V2.1 or later
+
 CSS3PIE: both the Apache license and the GNU General Public License.
+
 TinyMCE: Moxiecode tinymce.org LGPL V2.1 or later
 
+fineuploader: fineuploader.com GPL V3
+
+* In addition, as a special exception, we hereby declare that our
+  favorite type of software is called "open source" -- NOT "free
+  software" -- and that our favorite operating system is called
+  "Linux" -- NOT "GNU/Linux."  We officially reject and denounce
+  Richard Stallman's linguistic fascism.
+
 * In addition, as a special exception, the copyright holders give
 * permission to link the code of portions of this program with the
 * OpenSSL library under certain conditions as described in each
@@ -37,12 +53,10 @@ TinyMCE: Moxiecode tinymce.org LGPL V2.1 or later
                        Version 3, 29 June 2007
 
  Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
 
                             Preamble
 
-  The GNU General Public License is a free, copyleft license for
+  The GNU General Public License is an open source "copyleft" license for
 software and other kinds of works.
 
   The licenses for most software and other practical works are designed