From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 10.90.87.14 with SMTP id k14cs1325240agb; Thu, 31 Dec 2009 12:31:53 -0800 (PST) Received: by 10.229.68.227 with SMTP id w35mr2965206qci.91.1262291513343; Thu, 31 Dec 2009 12:31:53 -0800 (PST) Return-Path: Received: from rubyforge.org (rubyforge.org [205.234.109.19]) by mx.google.com with ESMTP id 39si22249640qyk.16.2009.12.31.12.31.53; Thu, 31 Dec 2009 12:31:53 -0800 (PST) Received-SPF: pass (google.com: domain of sup-devel-bounces@rubyforge.org designates 205.234.109.19 as permitted sender) client-ip=205.234.109.19; Authentication-Results: mx.google.com; spf=pass (google.com: domain of sup-devel-bounces@rubyforge.org designates 205.234.109.19 as permitted sender) smtp.mail=sup-devel-bounces@rubyforge.org Received: from rubyforge.org (rubyforge.org [127.0.0.1]) by rubyforge.org (Postfix) with ESMTP id 15213167830A; Thu, 31 Dec 2009 15:31:53 -0500 (EST) Received: from entry.masanjin.net (masanjin.net [209.20.72.13]) by rubyforge.org (Postfix) with ESMTP id A18DB1858267 for ; Thu, 31 Dec 2009 15:31:51 -0500 (EST) Received: from w by entry.masanjin.net with local (Exim 4.69) (envelope-from ) id 1NQRgU-00030X-Hv; Thu, 31 Dec 2009 12:31:50 -0800 From: William Morgan To: sup-devel mailing list Date: Thu, 31 Dec 2009 12:31:50 -0800 Message-Id: <1262291246-sup-2713@masanjin.net> User-Agent: Sup/git Subject: [sup-devel] topic branch merge report X-BeenThere: sup-devel@rubyforge.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: Sup developer discussion List-Id: Sup developer discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: sup-devel-bounces@rubyforge.org Errors-To: sup-devel-bounces@rubyforge.org Hi all, I've merged the following branches down to master: 'thread-joining-fix', 'no-mailcap-on-darwin', 'label-list-mode-auto-update', 'interactive-crypto', 'label-list-mode-hooks', 'refine-inbox-mode', 'poll-unusual', 'attach-wildcards', 'order-names-by-date' and 'save-all-attachments'. Rich, I think I need your help with the two branches 'xapian-bugfix' and 'xapian-message-state', which are generating a conflict for some reason, and I don't understand the code well enough to resolve. Would you be able to publish a branch ahead of master that has these two merged? Thanks! -- William _______________________________________________ Sup-devel mailing list Sup-devel@rubyforge.org http://rubyforge.org/mailman/listinfo/sup-devel