Re: [sup-devel] topic branch merge report

2009-12-31 Thread William Morgan
Reformatted excerpts from Rich Lane's message of 2009-12-31: > Done. Branch xapian-merged at git://github.com/rlane/sup Thank you. Also merged into master. -- William ___ Sup-devel mailing list Sup-devel@rubyforge.org http://rubyforge.org/mailman/listi

Re: [sup-devel] topic branch merge report

2009-12-31 Thread Rich Lane
Excerpts from William Morgan's message of Thu Dec 31 15:31:50 -0500 2009: > 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 > a

[sup-devel] topic branch merge report

2009-12-31 Thread William Morgan
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,