forked from bartvdbraak/blender
bb1f8d9586
Conflicts resolved: source/blender/blenloader/intern/readfile.c source/blender/editors/interface/resources.c source/blender/editors/mesh/editmesh_tools.c |
||
---|---|---|
.. | ||
blender_file_format | ||
build_systems | ||
doxygen | ||
guides | ||
license | ||
manpage | ||
python_api |