Commit b9961967 authored by wind2009's avatar wind2009

Reapply "Merge remote-tracking branch 'mercury/patch-openmp' into develop"

This reverts commit 4e279b89.
parent 4e279b89
Pipeline #35992 passed with stages
in 7 minutes