Pablo Vazquez 1e0eb925c4 Merge branch 'blender-v4.2-release' ...

# Conflicts:
#	source/blender/blenkernel/BKE_blender_version.h
#	source/blender/blenloader/intern/versioning_400.cc

2024-06-20 15:18:37 +02:00

..

blender

Merge branch 'blender-v4.2-release'

2024-06-20 15:18:37 +02:00

creator

Merge branch 'blender-v4.2-release'

2024-06-17 19:39:13 +02:00

CMakeLists.txt

Revert changes from main commits that were merged into blender-v4.1-release

2024-03-18 15:04:12 +01:00