-
Mickaël Turnel authored
(cherry picked from commit fefd58f307015c19bfb9ef1d3d350380c4245c6d) (cherry picked from commit a5740cd5) # Conflicts: # coreapi/private.h
4caf9ed0
(cherry picked from commit fefd58f307015c19bfb9ef1d3d350380c4245c6d) (cherry picked from commit a5740cd5) # Conflicts: # coreapi/private.h