d433cd65f7127d60e17d05a824290423ad226eae

Conflicts resolved: release/datafiles/startup.blend source/blender/blenkernel/CMakeLists.txt source/blender/blenlib/intern/bpath.c source/blender/blenloader/intern/readfile.c
…
Description
No description provided
Languages
C++
78.1%
Python
15%
C
2.8%
GLSL
1.8%
CMake
1.2%
Other
0.9%