[Bf-committers] Blender developers irc meeting, June 26, 2011

[Sergey I. Sharybin]

  Hi,

I've just run `svn merge ^/trunk/blender` in salad branch and everything 
was smooth. Now salad should be synced with trunk.

Sergey I. Sharybin wrote:
> Ton Roosendaal wrote:
>> 3) Google Summer of Code
>>
>> - Salad merging with current trunk gives problems. Who helps?
> I could do it tomorrow evening.
>
> -- 
> With best regards, Sergey I. Sharybin


-- 
With best regards, Sergey I. Sharybin