[Adium-devl] Branching, and SoC Merge Plans

[Andreas Monitzer]

On Sep 24, 2006, at 20:20, David Smith wrote:

> 	1) branch 1.0 after the last non-joscar regression is fixed. Because
> SoC involves no joscar changes, merges should be trivially easy for
> those fixes.

That's not true. My branch involves some changes to joscar, since you  
can't have two separate Java VMs in the same process. However, they  
should be easy to merge back, as long as the bug fixes don't involve  
adding/referencing more Java classes to the project.

andy