strange, I have freetype enabled by default and I don't have problems,
are you mergning stuff with utf-8 characters? :P

On 2013-06-25, at 10:59, Stéphane Ducasse <[email protected]> wrote:

> apparently it is broken when I enable 
> FT2 
> 
> So I removed it and it works.
> 
> Stef
> 
> On Jun 25, 2013, at 10:39 AM, Stéphane Ducasse <[email protected]> 
> wrote:
> 
>> Because I cannot merge my fix 10735 to understand the conflicts ;( the merge 
>> tools does not show up.
>> I will see how I can recover my work because I spent some hours on it.
>> 
>> Stef
> 
> 


Reply via email to