Update nikhiljnv:master with Khronos:master
authorNikhil Joshi <nikhilj@nvidia.com>
Fri, 10 Jan 2020 10:32:42 +0000 (16:02 +0530)
committerNikhil Joshi <nikhilj@nvidia.com>
Fri, 10 Jan 2020 10:32:42 +0000 (16:02 +0530)
commitb20d7b034e73265fc87c283a3d021e57596fc7f5
tree70c8c978a30f06889b51f173b89c4ce5c045cf8f
parent6894b536059ffe37929df555f70507147c0bbc84
parent84c7740ec179f78e2f67090dd1aa39f3efd91e40
Update nikhiljnv:master with Khronos:master

Merge branch 'KhronosGroup-master'
CMakeLists.txt
loader/icd.h
loader/windows/OpenCL.rc
loader/windows/icd_windows.c
loader/windows/icd_windows_hkr.c