forked from bartvdbraak/blender
2585d52405
Conflicts resolved: doc/python_api/sphinx_doc_gen.py source/blender/blenkernel/intern/subsurf_ccg.c source/blender/editors/mesh/editmesh_tools.c source/blender/makesdna/DNA_scene_types.h |
||
---|---|---|
.. | ||
blender | ||
blenderplayer | ||
creator | ||
darwin | ||
gameengine | ||
icons | ||
tests | ||
CMakeLists.txt | ||
SConscript |