forked from bartvdbraak/blender
d433cd65f7
Conflicts resolved: release/datafiles/startup.blend source/blender/blenkernel/CMakeLists.txt source/blender/blenlib/intern/bpath.c source/blender/blenloader/intern/readfile.c |
||
---|---|---|
.. | ||
bin | ||
darwin | ||
datafiles | ||
freedesktop | ||
scripts | ||
text | ||
windows | ||
environment-macosx | ||
environment-mswindows | ||
environment-unix |