From commits-return-17853-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org Thu Jan 26 13:26:24 2012 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 368C29985 for ; Thu, 26 Jan 2012 13:26:24 +0000 (UTC) Received: (qmail 33032 invoked by uid 500); 26 Jan 2012 13:26:24 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 32965 invoked by uid 500); 26 Jan 2012 13:26:23 -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 32958 invoked by uid 99); 26 Jan 2012 13:26:23 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Jan 2012 13:26:23 +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; Thu, 26 Jan 2012 13:26:22 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 412B823889E0 for ; Thu, 26 Jan 2012 13:26:02 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1236170 - in /cxf/branches/2.4.x-fixes: ./ .gitignore Date: Thu, 26 Jan 2012 13:26:02 -0000 To: commits@cxf.apache.org From: ay@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120126132602.412B823889E0@eris.apache.org> Author: ay Date: Thu Jan 26 13:26:01 2012 New Revision: 1236170 URL: http://svn.apache.org/viewvc?rev=1236170&view=rev Log: Merged revisions 1236169 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes ................ r1236169 | ay | 2012-01-26 14:17:33 +0100 (Thu, 26 Jan 2012) | 9 lines Merged revisions 1236166 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1236166 | ay | 2012-01-26 14:04:03 +0100 (Thu, 26 Jan 2012) | 1 line fixed .gitignore so .idl files are not ignored ........ ................ Modified: cxf/branches/2.4.x-fixes/ (props changed) cxf/branches/2.4.x-fixes/.gitignore Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jan 26 13:26:01 2012 @@ -1,2 +1,2 @@ -/cxf/branches/2.5.x-fixes:1235547,1235731,1235848 -/cxf/trunk:1235544,1235730,1235844 +/cxf/branches/2.5.x-fixes:1235547,1235731,1235848,1236169 +/cxf/trunk:1235544,1235730,1235844,1236166 Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.4.x-fixes/.gitignore URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/.gitignore?rev=1236170&r1=1236169&r2=1236170&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/.gitignore (original) +++ cxf/branches/2.4.x-fixes/.gitignore Thu Jan 26 13:26:01 2012 @@ -1,4 +1,6 @@ -*.i?? +*.iml +*.ipr +*.iws .DS_Store .checkstyle .classpath