summaryrefslogtreecommitdiff
path: root/docs/licenses
diff options
context:
space:
mode:
authorAntonio Cunei <antonio.cunei@epfl.ch>2010-09-01 09:43:36 +0000
committerAntonio Cunei <antonio.cunei@epfl.ch>2010-09-01 09:43:36 +0000
commit58882f89e76fd1cf824dfd9c537cadf153064860 (patch)
treef61511b071df41d79413a7d2d468ccf945a35524 /docs/licenses
parentcc57d03af8a97c4b9a6162acbc3a727384bb8a86 (diff)
downloadscala-58882f89e76fd1cf824dfd9c537cadf153064860.tar.gz
scala-58882f89e76fd1cf824dfd9c537cadf153064860.tar.bz2
scala-58882f89e76fd1cf824dfd9c537cadf153064860.zip
Undid all commits between 22566 and 22597 included
in the 2.8.x branch, restoring the status to 2.8.0 final release, in preparation for 2.8.1.
Diffstat (limited to 'docs/licenses')
-rw-r--r--docs/licenses/apache_android.txt16
-rw-r--r--docs/licenses/bsd_jline.txt34
-rw-r--r--docs/licenses/mit_jquery.txt13
-rw-r--r--docs/licenses/mit_sizzle.txt13
-rw-r--r--docs/licenses/mit_tools.tooltip.txt13
5 files changed, 0 insertions, 89 deletions
diff --git a/docs/licenses/apache_android.txt b/docs/licenses/apache_android.txt
deleted file mode 100644
index 00f339625f..0000000000
--- a/docs/licenses/apache_android.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-Scala includes various example files for Android:
-
-Copyright (c) 2005-2009, The Android Open Source Project
-Copyright (c) 2007, Steven Osborn
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License. \ No newline at end of file
diff --git a/docs/licenses/bsd_jline.txt b/docs/licenses/bsd_jline.txt
deleted file mode 100644
index 4ac4a378ed..0000000000
--- a/docs/licenses/bsd_jline.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-Scala includes the jLine library:
-
-Copyright (c) 2002-2006, Marc Prud'hommeaux <mwp1@cornell.edu>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or
-without modification, are permitted provided that the following
-conditions are met:
-
-Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with
-the distribution.
-
-Neither the name of JLine nor the names of its contributors
-may be used to endorse or promote products derived from this
-software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/licenses/mit_jquery.txt b/docs/licenses/mit_jquery.txt
deleted file mode 100644
index ef2c570469..0000000000
--- a/docs/licenses/mit_jquery.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Scala includes the jQuery library:
-
-Copyright (c) 2010 John Resig
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
diff --git a/docs/licenses/mit_sizzle.txt b/docs/licenses/mit_sizzle.txt
deleted file mode 100644
index d81d30aa0f..0000000000
--- a/docs/licenses/mit_sizzle.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Scala includes the Sizzle library:
-
-Copyright (c) 2010 The Dojo Foundation
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
diff --git a/docs/licenses/mit_tools.tooltip.txt b/docs/licenses/mit_tools.tooltip.txt
deleted file mode 100644
index 27a4dbc788..0000000000
--- a/docs/licenses/mit_tools.tooltip.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Scala includes the Tools Tooltip library:
-
-Copyright (c) 2009 Tero Piirainen
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.