Return-Path: X-Original-To: apmail-flex-dev-archive@www.apache.org Delivered-To: apmail-flex-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 79337DEDF for ; Mon, 21 Jan 2013 22:06:27 +0000 (UTC) Received: (qmail 77183 invoked by uid 500); 21 Jan 2013 22:06:26 -0000 Delivered-To: apmail-flex-dev-archive@flex.apache.org Received: (qmail 77158 invoked by uid 500); 21 Jan 2013 22:06:26 -0000 Mailing-List: contact dev-help@flex.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@flex.apache.org Delivered-To: mailing list dev@flex.apache.org Received: (qmail 77150 invoked by uid 99); 21 Jan 2013 22:06:26 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Jan 2013 22:06:26 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: local policy) Received: from [69.167.147.50] (HELO franklin.liquidweb.com) (69.167.147.50) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Jan 2013 22:06:20 +0000 Received: from localhost ([127.0.0.1]:39463) by franklin.liquidweb.com with esmtpsa (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.80) (envelope-from ) id 1TxPV6-00077y-CZ for dev@flex.apache.org; Mon, 21 Jan 2013 17:05:56 -0500 Received: from 70.105.247.167 ([70.105.247.167]) by franklin.liquidweb.com (Horde Framework) with HTTP; Mon, 21 Jan 2013 17:05:56 -0500 Message-ID: <20130121170556.13751aul8kaw98lg@franklin.liquidweb.com> Date: Mon, 21 Jan 2013 17:05:56 -0500 From: Michael Schmalle To: dev@flex.apache.org Subject: Re: [FalconJx] avoiding interesting merge situation ;-) References: <20130121160314.68136r8xbsjn055e@franklin.liquidweb.com> <20130121161002.60991plfg36xnwru@franklin.liquidweb.com> <20130121165823.81527arc6lxc8x6n@franklin.liquidweb.com> In-Reply-To: <20130121165823.81527arc6lxc8x6n@franklin.liquidweb.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; DelSp="Yes"; format="flowed" Content-Disposition: inline Content-Transfer-Encoding: 7bit User-Agent: Dynamic Internet Messaging Program (DIMP) H3 (1.1.8) X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - franklin.liquidweb.com X-AntiAbuse: Original Domain - flex.apache.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - teotigraphix.com X-Get-Message-Sender-Via: franklin.liquidweb.com: authenticated_id: teotigra/from_h X-Source: X-Source-Args: X-Source-Dir: X-Virus-Checked: Checked by ClamAV on apache.org Erik, It doesn't look like you merged my commits, they are gone from the GoogEmitter. Did you merge and refresh the eclipse files after you did it? Mike Quoting Michael Schmalle : > Erik, > > We seriously need to get a format.xml file to share for the Eclipse > formater. Once we get passed this rough development we are only > going to want to see non whitespace commits. > > I compulsively format all the time, it's habit. :) We can try to > make it look a lot like falcons's maybe use Gordons if he has one, > just need to get this figured out sooner than later. > > Mike > > -- > Michael Schmalle - Teoti Graphix, LLC > http://www.teotigraphix.com > http://blog.teotigraphix.com > > -- Michael Schmalle - Teoti Graphix, LLC http://www.teotigraphix.com http://blog.teotigraphix.com