diff options
author | Bastien Montagne <bastien@blender.org> | 2021-11-19 18:10:28 +0300 |
---|---|---|
committer | Bastien Montagne <bastien@blender.org> | 2021-11-19 18:10:28 +0300 |
commit | ec71054a9b7bf0d2218fa230855fc9af2e71bcc2 (patch) | |
tree | 742c6c9c97b95936f7d6b9897f9ce350dbdabb8c /source/blender/editors/space_file | |
parent | 330290d2a80d6b78f323cd1df9f3ea333d1cdb53 (diff) | |
parent | 33c5e7bcd5e5b790ee95caaa0c4d917996341266 (diff) |
Merge branch 'blender-v3.0-release'
Conflicts:
source/blender/blenkernel/BKE_blender_version.h
source/blender/blenloader/intern/versioning_300.c
Diffstat (limited to 'source/blender/editors/space_file')
0 files changed, 0 insertions, 0 deletions