[erlang-patches] Fix hibernate with HiPE

[Paul Guyot]

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
-- 
Semiocast            http://semiocast.com/
+33.183627948 - 20 rue Lacaze, 75014 Paris