summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2009-07-31 17:35:24 -0700
committerXavier Ducrohet <xav@android.com>2009-07-31 17:35:24 -0700
commitd08cf83aace1c40952cc57fa1a12bc3891565250 (patch)
treecab04cae2f88a2b63dd21465b7249ec98871bf5c
parent60a735fda1f9d7c24c577853304d486b0109632f (diff)
downloadandroid_development-d08cf83aace1c40952cc57fa1a12bc3891565250.tar.gz
android_development-d08cf83aace1c40952cc57fa1a12bc3891565250.tar.bz2
android_development-d08cf83aace1c40952cc57fa1a12bc3891565250.zip
Minor fix to the plug-ins license.
-rw-r--r--tools/eclipse/features/com.android.ide.eclipse.adt/feature.xml5
-rw-r--r--tools/eclipse/features/com.android.ide.eclipse.ddms/feature.xml6
2 files changed, 4 insertions, 7 deletions
diff --git a/tools/eclipse/features/com.android.ide.eclipse.adt/feature.xml b/tools/eclipse/features/com.android.ide.eclipse.adt/feature.xml
index e739044cc..74002cbb3 100644
--- a/tools/eclipse/features/com.android.ide.eclipse.adt/feature.xml
+++ b/tools/eclipse/features/com.android.ide.eclipse.adt/feature.xml
@@ -15,11 +15,8 @@
</copyright>
<license url="http://www.eclipse.org/org/documents/epl-v10.php">
- Note: jcommon-1.0.12.jar is under the BSD license rather than the APL. You can find a copy of the BSD License at http://www.opensource.org/licenses/bsd-license.php
+ Note: kxml2-2.3.0.jar is under the BSD license rather than the EPL. You can find a copy of the BSD License at http://www.opensource.org/licenses/bsd-license.php
-jfreechart-1.0.9.jar and jfreechart-1.0.9-swt.jar are under the LGPL rather than the EPL. You can find a copy of the LGPL at http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt. You can get the source code for these two components at http://android.git.kernel.org/pub/jfreechart-1.0.9.zip
-
-
Eclipse Public License - v 1.0
THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT&apos;S ACCEPTANCE OF THIS AGREEMENT.
diff --git a/tools/eclipse/features/com.android.ide.eclipse.ddms/feature.xml b/tools/eclipse/features/com.android.ide.eclipse.ddms/feature.xml
index e70c1b98a..884669b86 100644
--- a/tools/eclipse/features/com.android.ide.eclipse.ddms/feature.xml
+++ b/tools/eclipse/features/com.android.ide.eclipse.ddms/feature.xml
@@ -16,9 +16,9 @@
<license url="http://www.apache.org/licenses/LICENSE-2.0">
Note: jcommon-1.0.12.jar is under the BSD license rather than the APL. You can find a copy of the BSD License at http://www.opensource.org/licenses/bsd-license.php
- jfreechart-1.0.9.jar and jfreechart-1.0.9-swt.jar are under the LGPL rather than the EPL. You can find a copy of the LGPL at http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt. You can get the source code for these two components at http://android.git.kernel.org/pub/jfreechart-1.0.9.zip
-
-
+ jfreechart-1.0.9.jar and jfreechart-1.0.9-swt.jar are under the LGPL rather than the APL. You can find a copy of the LGPL at http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt. You can get the source code for these two components at http://android.git.kernel.org/pub/jfreechart-1.0.9.zip
+
+
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/