[erlang-patches] Fix hibernate with HiPE

[Niclas Axelsson]

On 01/29/2011 09:39 AM, Paul Guyot wrote:
> Le 18 janv. 2011 à 18:09, Niclas Axelsson a écrit :
>
>    
>> The 'dev' branch was updated yesterday and there was a merge conflict between your branch and 'dev'.
>> Can you please update your branch and check if you can solve the conflict?
>>      
> The rebased commit is here:
> https://github.com/pguyot/otp/commit/ce00ecb42c136b55d91ece38c9cf29b0d0cc6380
> git fetch git://github.com/pguyot/otp.git fix-hibernate-with-hipe branch
>
> Regards,
>
> Paul
>    
Great. I've refetched your branch and merged it into 'pu'.

Regards,
Niclas Axelsson, Erlang/OTP