forked from bartvdbraak/blender
a5152b7ca0
Conflicts resolved: source/blender/blenkernel/intern/idcode.c source/blender/blenloader/intern/readfile.c source/blender/editors/include/ED_anim_api.h source/blender/editors/include/UI_resources.h source/blender/makesrna/intern/rna_main.c |
||
---|---|---|
.. | ||
__init__.py | ||
bcolors.py | ||
Blender.py | ||
btools.py | ||
crossmingw.py | ||
mstoolkit.py |