aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhiro <hiro@ee746299-78ed-0310-b773-934348b2243d>2009-06-25 06:58:26 +0000
committerhiro <hiro@ee746299-78ed-0310-b773-934348b2243d>2009-06-25 06:58:26 +0000
commit862ccc35d89cf8855abe5e223fc26bee7d186fa4 (patch)
tree2f172a3669fd9db393b189e51c7f49a5b458c6df
parent5a621ae6d3067b0a4f0a382c59fa8c72b3d8cdf7 (diff)
updated COPYING and LICENSE.
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@2171 ee746299-78ed-0310-b773-934348b2243d
-rw-r--r--COPYING6
-rw-r--r--ChangeLog4
-rw-r--r--LICENSE7
3 files changed, 10 insertions, 7 deletions
diff --git a/COPYING b/COPYING
index 66cf319a..b7b5f53d 100644
--- a/COPYING
+++ b/COPYING
@@ -1,9 +1,3 @@
-The code in this distribution is Copyright 1999-2007 by Hiroyuki Yamamoto.
-
-Specific permission is granted for the GPLed code in this distribition to
-be linked to OpenSSL without invoking GPL clause 2(b).
-
--------------------------------------------------------------------------------
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
diff --git a/ChangeLog b/ChangeLog
index ad7335d3..cef89187 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2009-06-25
+ * updated COPYING and LICENSE.
+
+2009-06-25
+
* manual/ja/sylpheed.sgml: updated bsfilter description.
2009-06-17
diff --git a/LICENSE b/LICENSE
index 6090b167..263b61b8 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,2 +1,7 @@
+Sylpheed is Copyright 1999-2009 by Hiroyuki Yamamoto and
+Sylpheed Development Team, and distributed under the GNU GPL (COPYING).
+
+Specific permission is granted for the GPLed code in this distribition to
+be linked to OpenSSL without invoking GPL clause 2(b).
+
LibSylph is distributed under the GNU LGPL (COPYING.LIB).
-Other parts are distributed under the GNU GPL (COPYING).