projects / blender.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1bde6c0 312075e)
Merge branch 'blender-v2.81-release'
authorCampbell Barton <ideasman42@gmail.com>
Mon, 28 Oct 2019 14:38:34 +0000 (01:38 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 28 Oct 2019 14:38:34 +0000 (01:38 +1100)
1  2 
intern/cycles/kernel/CMakeLists.txt patch | diff1 | diff2 | blob | history

diff --cc intern/cycles/kernel/CMakeLists.txt
Simple merge
The official Blender Foundation tree