diff options
| author | Bastien Montagne <bastien@blender.org> | 2022-05-19 13:04:07 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2022-05-19 13:04:07 +0300 |
| commit | 4fc96e5000ce037b0247199e2c9fc440fbcc713f (patch) | |
| tree | 3fb955f92ce61478faf6c68d25c05485352fc98b /COPYING | |
| parent | f4cbfaded657886efa373a1fdbb45042be8e6c5c (diff) | |
| parent | 24745e8d27903ae741565c5e15f147d206a1030e (diff) | |
Merge branch 'blender-v3.2-release'
Conflicts:
source/blender/blenkernel/intern/lib_override.c
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions