forked from bartvdbraak/blender
353713afe8
Conflicts resolved: source/blender/makesrna/intern/rna_scene.c source/blender/python/intern/CMakeLists.txt Note for branch builders: Enabling Blender Player may cause linker errors. |
||
---|---|---|
.. | ||
bl_operators | ||
bl_ui | ||
keyingsets_builtins.py |