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. |
||
---|---|---|
.. | ||
bin | ||
datafiles | ||
freedesktop | ||
irix-6.2-mips | ||
plugins | ||
scripts | ||
text | ||
windows | ||
environment-macosx | ||
environment-mswindows | ||
environment-unix |