[Adium-devl] Caution: Merge Left

[David Smith]

On Nov 17, 2006, at 7:08 PM, Peter Hosey wrote:

> I have a couple of big merges to do that I wanted to run by you guys.
>
> == ProjectParallelization ==
>
> http://trac.adiumx.com/wiki/ProjectParallelization
>
> My current plan is to merge everything except the localization  
> changes, putting that off until 1.0 comes out.
>

Into trunk, I assume?


> Can you guys think of anything else that should be held?
>
> == Memory usage ==
>
> We made a lot of headway on Adium's memory usage when loading the  
> hypahrat log. The relevant changesets are:
>
>  * 18233 (Bigger read size)
>  * 18236 (Use one NSData instead of many)
>  * 18237 (Cleaner loop than 18236)
>  * 18243 (LMX r72 for 18245)
>  * 18245 (Create AIContentObject and throw away AIXMLElement tree  
> after every <message>, rather than when the five-message  
> requirement is satisfied; reduces peak memory usage to only that of  
> the largest message of the five)
>  * 18246 (Header for 18245)

Fine by me.