facebook-xmpp merged into adium-1.4

Sat Jun 25 14:04:57 UTC 2011

On Jun 24, 2011, at 6:20 PM, Evan Schoenberg, M.D. wrote:

> Could someone please figure out how to transplant the changes into the adium repository? Thanks.

OK, I spent an hour looking into this this morning. As far as I can tell, the only way to do this is to manually transplant each commit that was done on the branch.  Impossibly broken process.  Can anyone suggest something better?

-Evan