diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-06-13 13:36:24 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-06-13 13:36:24 +0300 |
commit | 224edde807d76dcccfdb2b204cfa1739d544eca0 (patch) | |
tree | 034b5e1afecc9473d2932010b88bc8c642f9fe59 /intern/cycles/kernel/CMakeLists.txt | |
parent | af2d39d902c0e302a32b979a8d47ff8e067c0d65 (diff) | |
parent | 617c4d6adbfe64b3a72b5c48f918f39d30aa18dc (diff) |
Merge branch 'master' into custom-normals-bmeshcustom-normals-bmesh
Diffstat (limited to 'intern/cycles/kernel/CMakeLists.txt')
0 files changed, 0 insertions, 0 deletions