beremiz

merge

16 months ago, Edouard Tisserant
2fb97bc2158a
merge
/**
* No platform specific code for "Generic" target
**/