Commit 1033d509 authored by Utkarsh Ayachit's avatar Utkarsh Ayachit Committed by Kitware Robot
Browse files

Merge topic 'vs2015-fixes'

d4a26514 tbb: bring in tbb fixes for vs2015.
9f368aaf

 vs2015: fixes to silo build.
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Shawn Waldon's avatarShawn Waldon <shawn.waldon@kitware.com>
Merge-request: !449
parents 3a4db77b d4a26514
Pipeline #99081 passed with stage
in 0 seconds