From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-we0-x230.google.com (mail-we0-x230.google.com [IPv6:2a00:1450:400c:c03::230]) by hurricane.the-brannons.com (Postfix) with ESMTPS id 696BF77AD8 for ; Tue, 24 Dec 2013 11:18:02 -0800 (PST) Received: by mail-we0-f176.google.com with SMTP id p61so6116415wes.21 for ; Tue, 24 Dec 2013 11:17:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=2TlPddy4ciBHor4ucHzt5sy9T+B3AUVlNkNNMV22I1k=; b=mSAmWBXmVjZBpKcTG86GBRl4b0w0M8IC9PL1cp9VaQ1luUcsZKWysyRf+ubbQIUcmj 8J7bQW6Kt4dUnRPHK+HanoADBHe8kfxQPU06NOk5qxyKV8Bt3TAKLMQWUxFbI5+H62PV pipYbFmRImPpIMKoPumSYxG9FV5gkUDMAip2TNHNfiI3h4N+qsNVoG8+rFeQA4nr8ZLK VUQL0VHhUZA3Wg4eSZb5trt6shGCWrjETM73FbQzgSECc/Ma9pwLEuySzaS+pPjHtFmp /aKfuFPMkQYIhfCj7gwm4bcGgOjPDRH22mkZArBJEZDnT0HOsB+n+zjjLQoVUjv20Fqh Xl4g== X-Received: by 10.180.205.138 with SMTP id lg10mr23180205wic.30.1387912676306; Tue, 24 Dec 2013 11:17:56 -0800 (PST) Received: from toaster.adamthompson.me.uk (toaster.adamthompson.me.uk. [2001:8b0:1142:9042::2]) by mx.google.com with ESMTPSA id qk7sm13118063wjc.19.2013.12.24.11.17.55 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 24 Dec 2013 11:17:55 -0800 (PST) Date: Tue, 24 Dec 2013 19:17:53 +0000 From: Adam Thompson To: Karl Dahlke Message-ID: <20131224191753.GI18259@toaster.adamthompson.me.uk> References: <20131124133307.eklhad@comcast.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20131124133307.eklhad@comcast.net> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: Edbrowse-dev@lists.the-brannons.com Subject: Re: [Edbrowse-dev] great X-BeenThere: edbrowse-dev@lists.the-brannons.com X-Mailman-Version: 2.1.17 Precedence: list List-Id: Edbrowse Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Dec 2013 19:18:02 -0000 On Tue, Dec 24, 2013 at 01:33:07PM -0500, Karl Dahlke wrote: > Oh and yes I put this patch in myself. > I've given up on git am > Can't get it to work any more. Ah, ok, this approach (not using git patches) is turning into conflict central and I've got no idea how to fix things so I can sync with the main branch without deleting my changes. On the plus side, I've now got a github account. Cheers, Adam.