Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 56AA975D2 for ; Fri, 19 Aug 2011 02:32:26 +0000 (UTC) Received: (qmail 30666 invoked by uid 500); 19 Aug 2011 02:32:26 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 30552 invoked by uid 500); 19 Aug 2011 02:32:25 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 30545 invoked by uid 99); 19 Aug 2011 02:32:25 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Aug 2011 02:32:25 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Aug 2011 02:32:24 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3214523889E5 for ; Fri, 19 Aug 2011 02:32:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1159486 - in /cxf/branches/2.4.x-fixes: ./ distribution/src/main/release/licenses/bouncy-castle.txt distribution/src/main/release/licenses/epl-v10.html Date: Fri, 19 Aug 2011 02:32:04 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110819023204.3214523889E5@eris.apache.org> Author: dkulp Date: Fri Aug 19 02:32:03 2011 New Revision: 1159486 URL: http://svn.apache.org/viewvc?rev=1159486&view=rev Log: Merged revisions 1159483 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1159483 | dkulp | 2011-08-18 22:27:49 -0400 (Thu, 18 Aug 2011) | 2 lines [CXF-3738] Remove bc license, add epl license "Patch" from Robert Liguori ........ Added: cxf/branches/2.4.x-fixes/distribution/src/main/release/licenses/epl-v10.html - copied unchanged from r1159483, cxf/trunk/distribution/src/main/release/licenses/epl-v10.html Removed: cxf/branches/2.4.x-fixes/distribution/src/main/release/licenses/bouncy-castle.txt Modified: cxf/branches/2.4.x-fixes/ (props changed) Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available.