Author: andar
Revision: 5025
Log:
Update LICENSE and ChangeLog
Diff:
Modified: branches/1.1.0_RC/ChangeLog
===================================================================
--- branches/1.1.0_RC/ChangeLog 2009-04-06 21:09:17 UTC (rev 5024)
+++ branches/1.1.0_RC/ChangeLog 2009-04-06 21:16:55 UTC (rev 5025)
@@ -10,6 +10,9 @@
==== WebUI ====
* Fix #870 use proper config location for loading ssl cert
+==== Misc ====
+ * Add OpenSSL exception to license
+
=== Deluge 1.1.5 - (16 March 2009) ===
==== Core ====
* Fix config file saving when no current config file exists
Modified: branches/1.1.0_RC/LICENSE
===================================================================
--- branches/1.1.0_RC/LICENSE 2009-04-06 21:09:17 UTC (rev 5024)
+++ branches/1.1.0_RC/LICENSE 2009-04-06 21:16:55 UTC (rev 5025)
@@ -1,3 +1,17 @@
+Deluge is licensed under the GNU General Public License version 3 with the
+addition of the following special exception:
+
+In addition, as a special exception, the copyright holders give
+permission to link the code of portions of this program with the OpenSSL
+library.
+You must obey the GNU General Public License in all respects for all of
+the code used other than OpenSSL. If you modify file(s) with this
+exception, you may extend this exception to your version of the file(s),
+but you are not obligated to do so. If you do not wish to do so, delete
+this exception statement from your version. If you delete this exception
+statement from all source files in the program, then also delete it here.
+
+
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"deluge-commit" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/deluge-commit?hl=en
-~----------~----~----~----~------~----~------~--~---
