beremiz

merge

18 months ago, Edouard Tisserant
8816aee01b07
merge
/**
* No platform specific code for "Generic" target
**/