diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2020-08-18 17:04:41 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2020-08-18 17:04:41 +0300 |
commit | 872efd8d73a3820680379230d83a0aadf5fc29ca (patch) | |
tree | f7afa0e32c99cdecec136f7fe317b8f78c4f5939 /source/blender/editors/object | |
parent | b3b67a61b7761508dd3369d12df90bb333200359 (diff) | |
parent | 47c6f41b8926befcf1ffe8b0dcccb90922c4b9be (diff) |
Merge branch 'blender-v2.90-release'
# Conflicts:
# source/blender/editors/space_node/node_draw.c
# source/blender/editors/space_sequencer/sequencer_draw.c
Diffstat (limited to 'source/blender/editors/object')
0 files changed, 0 insertions, 0 deletions