From mint-bounce@lists.fishpool.fi Sun Jun 13 15:37:36 2010 X-Virus-Scanned: amavisd-new at demon.co.uk Subject: Re: [MiNT] Merging branches From: Alan Hourihane To: Peter Slegg Cc: mint@lists.fishpool.fi In-Reply-To: <000103a4.01b8d2620f19@smtp.freeola.net> References: <1276452622.10969.10.camel@jetpack.demon.co.uk> <000103a4.01b8d2620f19@smtp.freeola.net> Content-Type: text/plain; charset="us-ascii" Date: Sun, 13 Jun 2010 20:36:12 +0100 Message-ID: <1276457772.10969.14.camel@jetpack.demon.co.uk> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3.1 Content-Transfer-Encoding: 7bit X-ecartis-version: Ecartis v1.0.0 Sender: mint-bounce@lists.fishpool.fi Errors-to: mint-bounce@lists.fishpool.fi X-original-sender: alanh@fairlite.co.uk Precedence: bulk List-help: List-unsubscribe: List-Id: X-List-ID: List-subscribe: List-owner: List-post: On Sun, 2010-06-13 at 19:16 +0200, Peter Slegg wrote: > On Sun, 13 Jun 2010 19:10:22 , Alan Hourihane wrote: > > > > On Sun, 2010-06-13 at 18:58 +0200, Peter Slegg wrote: > > > On Sun, 13 Jun 2010 16:45:00 , Alan Hourihane wrote: > > > > > > > > On Sun, 2010-06-13 at 16:19 +0200, Peter Slegg wrote: > > > > > How is progress on merging the branches going ? > > > > > > > > That was already done a week or so ago. > > > > > > > > Helmut's branch only slightly differs from the trunk now. > > > > > > > > Alan. > > > > > > > > > > So will the daily build disappear ? > > > > No, because Helmut can still use his branch for staging of future major > > changes that can be contained in his branch. > > > > So are we a step closer to building a beta release for the offical Freemint > site ? We're always stepping closer, but with the recent activity there appear to be a few niggles/bugs to fix. Alan. PS. You still haven't fixed MyMail's timezone, if you hadn't noticed. :-(