beremiz

merge

15 months ago, Edouard Tisserant
7da45bd15fc8
merge
/**
* No platform specific code for "Generic" target
**/