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 7FC08EAE8 for ; Mon, 21 Jan 2013 21:06:08 +0000 (UTC) Received: (qmail 50568 invoked by uid 500); 21 Jan 2013 21:06:07 -0000 Delivered-To: apmail-flex-dev-archive@flex.apache.org Received: (qmail 50549 invoked by uid 500); 21 Jan 2013 21:06:07 -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 50540 invoked by uid 99); 21 Jan 2013 21:06:07 -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 21:06:07 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=RCVD_IN_DNSWL_LOW,SPF_NEUTRAL X-Spam-Check-By: apache.org Received-SPF: neutral (athena.apache.org: local policy) Received: from [209.85.223.181] (HELO mail-ie0-f181.google.com) (209.85.223.181) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Jan 2013 21:06:02 +0000 Received: by mail-ie0-f181.google.com with SMTP id 16so10356324iea.40 for ; Mon, 21 Jan 2013 13:05:42 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-received:in-reply-to:references:date:message-id :subject:from:to:content-type:x-gm-message-state; bh=sqeSo6WlvwdxEr5PKdnx8h2IjNOmW01Kin9a0tJ79uo=; b=YQ5Qw5l8fDDyX0l7u7nTWOkIbsADzecjpUQOwyqBzXDmI+sC+o4tJuBuxumu/I2Rrn 475kCwvo2yc9Te7eYvpaKxRzXlV7wpA8slFVsEPlJ7GkOHlUm5iz9Hz1m8Ra7oL7xEZq MWaGu1vPkcxDkjcOSzLjtW3vDbZuQva7R+HGY8H44br/+Gy9qcMQ8imGM5Cnj3CIDwgV inlD6ZjikrSc0qWWsIzqnUVWeQDhldgcG+VQzO6h/nv/7svjp4ZV599iJVZsEXBrVHoM 6oFtOXTL+OV9mqA7kauI9FXsoYTzaxTMpa+cN48lCFyOzojdZVRuRyIcb/iUiCQYCxy8 S3oQ== MIME-Version: 1.0 X-Received: by 10.50.150.167 with SMTP id uj7mr10313718igb.33.1358802342064; Mon, 21 Jan 2013 13:05:42 -0800 (PST) Received: by 10.64.37.100 with HTTP; Mon, 21 Jan 2013 13:05:41 -0800 (PST) In-Reply-To: <20130121160314.68136r8xbsjn055e@franklin.liquidweb.com> References: <20130121160314.68136r8xbsjn055e@franklin.liquidweb.com> Date: Mon, 21 Jan 2013 22:05:41 +0100 Message-ID: Subject: Re: [FalconJx] avoiding interesting merge situation ;-) From: Erik de Bruin To: "dev@flex.apache.org" Content-Type: text/plain; charset=ISO-8859-1 X-Gm-Message-State: ALoCoQk7MF94KyKlAxyRFy5Wj3DAfbM9waJtCUuUofw7bgvBU3s1/LKwXAmKDOx+mf6gHMyUw7sW X-Virus-Checked: Checked by ClamAV on apache.org Awesome! You go ahead, play for a while :-) Wouldn't want to break you out of the zone. My changes can wait, I have other loose ends to tie up. Have fun! EdB On Mon, Jan 21, 2013 at 10:03 PM, Michael Schmalle wrote: > Err... > > DO it NOW! :) I am on a roll and at a point where it's safe, let me commit > one more tiny change. > > Check this out. :) > > > goog.provide('Main'); > > goog.require('spark.components.Button'); > goog.require('mx.events.FlexEvent'); > > /** > * @param {FlexEvent} event > */ > Main.prototype.creationCompleteHandler = function(event) { > var /** @type {Example} */ main = new Example(); > this.addElement(main); > main.init(); > } > > It's fun playing in the sand! > > > Mike > > > > > > Quoting Erik de Bruin : > >> Mike, >> >> In the interest of expediency, will you be checking in a lot more >> today, or can I start to merge my local changes with your latest >> commits? >> >> EdB >> >> >> >> -- >> Ix Multimedia Software >> >> Jan Luykenstraat 27 >> 3521 VB Utrecht >> >> T. 06-51952295 >> I. www.ixsoftware.nl >> > > -- > Michael Schmalle - Teoti Graphix, LLC > http://www.teotigraphix.com > http://blog.teotigraphix.com > -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl