Changeset 1071

Timestamp:

06/28/08 13:15:59 (2 months ago)

Author:

mattknox_ca

Message:

merged information from doc/README into license.txt

Files:

• trunk/timeseries/license.txt (modified) (3 diffs)
• trunk/timeseries/scikits/timeseries/doc/README (deleted)

trunk/timeseries/license.txt

@@ -3 +3 @@
-
-Also, please note the following:
+
+Parts of the documentation (scikits/timeseries/doc/) framework were borrowed
+from the matplotlib project. And as such, it is subject to the terms of the
+matplotlib license. Please see http://matplotlib.sourceforge.net/license.html
+for more details.
+
+=================================================================
-
-The timeseries scikit contains code borrowed from the EGENIX mx.DateTime
@@ -112 +119 @@
-    documentation ("the Software").
-
- 
+
-
-    Subject to the terms and conditions of this eGenix.com Public
@@ -152 +159 @@
-    material breach of its terms and conditions.
-
- 
+
-
-    Any software or documentation in source or binary form provided