Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-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 A2EFD982A for ; Mon, 14 Nov 2011 19:52:45 +0000 (UTC) Received: (qmail 61520 invoked by uid 500); 14 Nov 2011 19:52:45 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 61489 invoked by uid 500); 14 Nov 2011 19:52:45 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 61482 invoked by uid 99); 14 Nov 2011 19:52:45 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Nov 2011 19:52:45 +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; Mon, 14 Nov 2011 19:52:44 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 859912388978 for ; Mon, 14 Nov 2011 19:52:24 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1201852 - in /camel/branches/camel-2.8.x: ./ .gitignore Date: Mon, 14 Nov 2011 19:52:24 -0000 To: commits@camel.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111114195224.859912388978@eris.apache.org> Author: dkulp Date: Mon Nov 14 19:52:24 2011 New Revision: 1201852 URL: http://svn.apache.org/viewvc?rev=1201852&view=rev Log: Merged revisions 1197303 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk ........ r1197303 | iocanel | 2011-11-03 16:49:11 -0400 (Thu, 03 Nov 2011) | 1 line Added .idea to .gitignore ........ Modified: camel/branches/camel-2.8.x/ (props changed) camel/branches/camel-2.8.x/.gitignore Propchange: camel/branches/camel-2.8.x/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: camel/branches/camel-2.8.x/.gitignore URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/.gitignore?rev=1201852&r1=1201851&r2=1201852&view=diff ============================================================================== --- camel/branches/camel-2.8.x/.gitignore (original) +++ camel/branches/camel-2.8.x/.gitignore Mon Nov 14 19:52:24 2011 @@ -1,5 +1,6 @@ target *.i?? +.idea .DS_Store .classpath .project