diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-08-07 17:06:39 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-08-07 17:06:39 +0300 |
commit | c116bb0c7fdae35fbb062260cc9581eb3b4f36cf (patch) | |
tree | 1663c0aeea6caf32a19a557e52629d7a0717dafe /intern/cycles/kernel/kernels/opencl/kernel.cl | |
parent | 881ee4fb26666d43d841b3c9ad288d861331e420 (diff) | |
parent | 580741b317ae60eb3bf999d636da0325c7e67373 (diff) |
Merge branch 'master' into id_copy_refactor
Diffstat (limited to 'intern/cycles/kernel/kernels/opencl/kernel.cl')
0 files changed, 0 insertions, 0 deletions