diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-05-19 16:37:26 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-05-19 16:37:26 +0400 |
commit | 2e66cb520c5e41b83665119a9787e9839ce7c2b3 (patch) | |
tree | db75460ffa969f715dceafebf95a8c0acd0c73d3 /intern/cycles/kernel/kernel_globals.h | |
parent | 74cccd1566e0e82a0f34d3ea1cab449cecfcbfd5 (diff) | |
parent | e088f592bd82f5c3863368f49eabd3e8afffe119 (diff) |
Cycles: svn merge -r36747:36777 https://svn.blender.org/svnroot/bf-blender/trunk/blender/
Diffstat (limited to 'intern/cycles/kernel/kernel_globals.h')
0 files changed, 0 insertions, 0 deletions