tree fafe59727e6948cf075e3ed244eeb229114528d6
parent 384c3f9e9e743b1edb1e7b441d113b6e5e68085d
parent 735e69f4458850cc335710af36d1382b891cbb5e
author Brad King <brad.king@kitware.com> 1531402590 -0400
committer Brad King <brad.king@kitware.com> 1531402590 -0400

Merge branch 'intel-std-fix' into release-3.12

Merge-request: !2206