forked from bartvdbraak/blender
e91f33101f
Conflicts resolved: source/blender/editors/interface/resources.c |
||
---|---|---|
.. | ||
bl_operators | ||
bl_ui | ||
keyingsets_builtins.py |
e91f33101f
Conflicts resolved: source/blender/editors/interface/resources.c |
||
---|---|---|
.. | ||
bl_operators | ||
bl_ui | ||
keyingsets_builtins.py |