forked from bartvdbraak/blender
94ae0232b0
Conflicts resolved: release/datafiles/startup.blend source/blender/blenloader/intern/readfile.c |
||
---|---|---|
.. | ||
bin | ||
darwin | ||
datafiles | ||
freedesktop | ||
scripts | ||
text | ||
windows | ||
environment-macosx | ||
environment-mswindows | ||
environment-unix |