aboutsummaryrefslogtreecommitdiff
path: root/libjava/classpath/LICENSE
diff options
context:
space:
mode:
authorTom Tromey <tromey@gcc.gnu.org>2007-01-09 19:58:05 +0000
committerTom Tromey <tromey@gcc.gnu.org>2007-01-09 19:58:05 +0000
commit97b8365cafc3a344a22d3980b8ed885f5c6d8357 (patch)
tree996a5f57d4a68c53473382e45cb22f574cb3e4db /libjava/classpath/LICENSE
parentc648dedbde727ca3f883bb5fd773aa4af70d3369 (diff)
downloadgcc-97b8365cafc3a344a22d3980b8ed885f5c6d8357.zip
gcc-97b8365cafc3a344a22d3980b8ed885f5c6d8357.tar.gz
gcc-97b8365cafc3a344a22d3980b8ed885f5c6d8357.tar.bz2
Merged gcj-eclipse branch to trunk.
From-SVN: r120621
Diffstat (limited to 'libjava/classpath/LICENSE')
-rw-r--r--libjava/classpath/LICENSE14
1 files changed, 13 insertions, 1 deletions
diff --git a/libjava/classpath/LICENSE b/libjava/classpath/LICENSE
index ae2588d..44620dc 100644
--- a/libjava/classpath/LICENSE
+++ b/libjava/classpath/LICENSE
@@ -299,6 +299,19 @@ terms:
above copyright notice and this permission notice are included in
all copies or substantial portions of the software.
+The files in java/util/concurrent and subdirectories (with the
+exception of CopyOnWriteArrayList.java), along with
+java.util.NavigableMap, java.util.NavigableSet, java.util.Deque and
+java.util.ArrayDeque, are taken from JSR166 concurrency materials
+maintained by Doug Lea and distributed under the following terms:
+
+ Written by Doug Lea with assistance from members of JCP JSR-166
+ Expert Group and released to the public domain, as explained at
+ http://creativecommons.org/licenses/publicdomain
+
+CopyOnWriteArrayList.java has been reimplemented for GNU Classpath,
+and is distributed under the same terms as other GNU Classpath files,
+as specified at the top of this file.
Directory external/relaxngDatatype
RELAX NG Pluggable Datatype Libraries. All files are distributed under
@@ -345,4 +358,3 @@ the following notice:
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.
-