projects / platform / upstream / OpenCL-ICD-Loader.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ebbcd14 e6e30ab)
Update nikhiljnv:new_para_virtual with Khronos master
authorNikhil Joshi <nikhilj@nvidia.com>
Fri, 9 Aug 2019 10:14:24 +0000 (15:44 +0530)
committerNikhil Joshi <nikhilj@nvidia.com>
Fri, 9 Aug 2019 10:19:06 +0000 (15:49 +0530)
Merge branch 'master' of https://github.com/KhronosGroup/OpenCL-ICD-Loader into KhronosGroup-master

1  2 
README.md patch | diff1 | diff2 | blob | history
loader/linux/icd_linux.c patch | diff1 | diff2 | blob | history
loader/windows/icd_windows.c patch | diff1 | diff2 | blob | history

diff --cc README.md
Simple merge
diff --cc loader/linux/icd_linux.c
Simple merge
diff --cc loader/windows/icd_windows.c
Simple merge
Domain: Graphics System / GL;