diff options
author | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2010-11-02 21:27:11 +0000 |
---|---|---|
committer | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2010-11-02 21:27:11 +0000 |
commit | 75d0f6c142c6b8bfd6f6de8d4919ea4b70921542 (patch) | |
tree | 6979856dfed7f91c71759b233ee3db524677cbdf /sca-java-1.x/trunk/modules/assembly-xsd/NOTICE | |
parent | 82559b1bbb5f3a5e093f21fd59392e7cacd29e16 (diff) |
Merge r1030212 TUSCANY-3764: Fix problems and inconsistencies in LICENSE and NOTICE files
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1030233 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r-- | sca-java-1.x/trunk/modules/assembly-xsd/NOTICE | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/sca-java-1.x/trunk/modules/assembly-xsd/NOTICE b/sca-java-1.x/trunk/modules/assembly-xsd/NOTICE index 49ff935a41..ad2ba40961 100644 --- a/sca-java-1.x/trunk/modules/assembly-xsd/NOTICE +++ b/sca-java-1.x/trunk/modules/assembly-xsd/NOTICE @@ -4,20 +4,3 @@ Copyright (c) 2005 - 2010 The Apache Software Foundation This product includes software developed by The Apache Software Foundation (http://www.apache.org/). -This product also includes software under the SCA Collaboration license -(see the LICENSE file contained in this distribution), with the following -copyright: - -(c) Copyright SCA Collaboration 2006, 2007 - -This product also includes software under the W3C(r) Software License -(see the LICENSE file contained in this distribution), with the following -copyright: - -Copyright (c) 2004 World Wide Web Consortium (Massachusetts Institute of Technology, -European Research Consortium for Informatics and Mathematics, Keio University). -All Rights Reserved. This work is distributed under the W3C(r) Software License [1] -in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied -warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - - [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231 |