Author: bayard
Date: Tue Jan 24 05:58:28 2006
New Revision: 371916
URL: http://svn.apache.org/viewcvs?rev=371916&view=rev
Log:
jython uses a combined asl/jpython 1.1/jython(bsd) license
Modified:
incubator/roller/trunk/README.txt
Modified: incubator/roller/trunk/README.txt
URL:
http://svn.apache.org/viewcvs/incubator/roller/trunk/README.txt?rev=371916&r1=371915&r2=371916&view=diff
==============================================================================
--- incubator/roller/trunk/README.txt (original)
+++ incubator/roller/trunk/README.txt Tue Jan 24 05:58:28 2006
@@ -52,8 +52,10 @@
* Roller includes the Radeox Wiki Engine, LGPL license
- * Roller includes Jython, Jython Software License (BSD style)
- Copyright (c) Jython Developers
+ * Roller includes Jython, Copyright (c) Jython Developers
+ Combined license { Jython Software License (BSD style)
+ Apache Software License
+ JPython 1.1 License }
* Roller include icons by Mark James (http://www.famfamfam.com/lab/icons)
License is http://creativecommons.org/licenses/by/2.5/
