From 75d0f6c142c6b8bfd6f6de8d4919ea4b70921542 Mon Sep 17 00:00:00 2001 From: nash Date: Tue, 2 Nov 2010 21:27:11 +0000 Subject: 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 --- sca-java-1.x/trunk/modules/implementation-bpel-ode/NOTICE | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'sca-java-1.x/trunk/modules/implementation-bpel-ode/NOTICE') diff --git a/sca-java-1.x/trunk/modules/implementation-bpel-ode/NOTICE b/sca-java-1.x/trunk/modules/implementation-bpel-ode/NOTICE index 9bc1ce916d..9ddba06a32 100644 --- a/sca-java-1.x/trunk/modules/implementation-bpel-ode/NOTICE +++ b/sca-java-1.x/trunk/modules/implementation-bpel-ode/NOTICE @@ -4,14 +4,3 @@ Copyright (c) 2005 - 2010 The Apache Software Foundation This product includes software developed by The Apache Software Foundation (http://www.apache.org/). -Unless otherwise indicated, all distribution made available by the Apache Software Foundation -is provided to you under the terms and conditions of the Apache License Version 2.0 ("AL"). -A copy of the AL is provided with this distribution as the LICENSE file present in the -root directory, and is also available at http://www.apache.org/licenses/. - -This product also includes software under the BSD license -(see the LICENSE file contained in this distribution), with -the following copyright: - -Copyright (c) 2006, Sun Microsystems, Inc. -All rights reserved. -- cgit v1.2.3