forked from bartvdbraak/blender
1f7ae143a2
Conflicts resolved: source/blender/blenloader/intern/readfile.c source/blender/editors/space_file/filelist.c |
||
---|---|---|
.. | ||
bin | ||
datafiles | ||
freedesktop | ||
scripts | ||
text | ||
windows | ||
environment-macosx | ||
environment-mswindows | ||
environment-unix |