[Adium-devl] trunk vs. adium-1.1: Merging and localization

[David Smith]

	Merge coming soon for my most recent change... my trunk checkout is  
annoyingly full of local changes, so I need to do a fresh one.

On Jul 13, 2007, at 9:21 AM, Evan Schoenberg wrote:

>  * Please do not make code changes on theadium-1.1 branch which are  
> not also immediately made on trunk unless there's a really really  
> good reason to do so.  If you commit to adium-1.1, it is your  
> responsibility to ensure that you also do a merge and commit to  
> trunk.  (You can of course commit to trunk without merging to 1.1).