diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2020-08-24 12:31:06 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2020-08-24 12:31:06 +0300 |
| commit | 6b1b2ded77f17b2a688f8a3168585864c05260c8 (patch) | |
| tree | 728cb4616c2b96bdc4eb70073433d9f823071c7d /intern | |
| parent | e4932d1167f486e59d38a9d599e473e4888872ec (diff) | |
| parent | 35ef42d967c7c127dea8bcd6b8173e722f3a853c (diff) | |
Merge branch 'blender-v2.90-release' into master
# Conflicts:
# source/blender/editors/space_node/node_draw.c
# source/blender/editors/space_sequencer/sequencer_draw.c
Diffstat (limited to 'intern')
0 files changed, 0 insertions, 0 deletions