[Bf-committers] 2.69rc2 (Proposed revs to merge)

[Campbell Barton]

- Committed changes from selected revs up until, r60755
- Removed r60746 from the list.

http://wiki.blender.org/index.php/User:Ideasman42/269_bugfix

Waiting on new rc2 splash.

On Tue, Oct 15, 2013 at 1:59 AM, Bastien Montagne <montagne29 at wanadoo.fr> wrote:
> I have some questions about translations, btw... People have kept making
> quite a bunch of updates & fixes to translations since last week.
> However, if I just update from current blender trunk, translations'
> trunk won't match anymore 2.69 branch.
>
> Should I consider updating translations' 2.69 branch against Blender's
> 2.69 branch, once all fixes have been backported, but before AHOY? Or
> isn't it worth it, and we just keep current translations' 2.69 branch as is?
>
> On 14/10/2013 16:15, Sergey Sharybin wrote:
>> 60746 is gonna to break translations
>>
>> And if we're backporting non-regressions as well, Gaia have some fix for
>> collada.
>>
>>
>> On Mon, Oct 14, 2013 at 1:37 PM, Antony Riakiotakis<kalast at gmail.com>wrote:
>>
>>> Hey Campbel 60682 is OK to merge I think. It doesn't solve the issue
>>> completely but it's an improvement over the current behaviour.
>>> _______________________________________________
>>> Bf-committers mailing list
>>> Bf-committers at blender.org
>>> http://lists.blender.org/mailman/listinfo/bf-committers
>>>
>>
>>
> _______________________________________________
> Bf-committers mailing list
> Bf-committers at blender.org
> http://lists.blender.org/mailman/listinfo/bf-committers



-- 
- Campbell