forked from bartvdbraak/blender
55015daa43
Conflicts resolved: source/blender/blenkernel/CMakeLists.txt source/blender/blenloader/intern/readfile.c source/blender/editors/mesh/editmesh_tools.c source/blender/makesrna/intern/rna_main_api.c |
||
---|---|---|
.. | ||
bin | ||
datafiles | ||
freedesktop | ||
scripts | ||
text | ||
windows | ||
environment-macosx | ||
environment-mswindows | ||
environment-unix |