tree 45eb2648e8a1a9bc57a227ab4def3288e40ff027
parent 2d7083435dbd60e800916b4380c90cd56c762691
parent 9c6762621def77472afb08fe4b9e1e5737405ee0
author Manuel Pégourié-Gonnard <mpg2@elzevir.fr> 1444056489 +0100
committer Manuel Pégourié-Gonnard <mpg2@elzevir.fr> 1444056489 +0100

Merge branch 'development' into development-restricted

* development:
  Remove inline workaround when not useful
  Fix macroization of inline in C++