diff options
| author | Pablo Vazquez <pablo@blender.org> | 2021-10-04 13:59:53 +0300 |
|---|---|---|
| committer | Pablo Vazquez <pablo@blender.org> | 2021-10-04 13:59:53 +0300 |
| commit | 2c5661682b61ac4a8a8f45f77a4eff7b85f6f141 (patch) | |
| tree | 6764021496d2e666d7d2bc15514fa9132f3649cc /intern/cycles/kernel/kernel_types.h | |
| parent | 4e50c5f4fb7d0439fd26f5b1064433e4bef5f70c (diff) | |
Merge branch 'master' into temp-ui-tweaks
# Conflicts:
# source/blender/editors/animation/time_scrub_ui.c
Diffstat (limited to 'intern/cycles/kernel/kernel_types.h')
0 files changed, 0 insertions, 0 deletions