forked from bartvdbraak/blender
3b711a6ed0
Conflicts resolved: source/blender/blenloader/intern/readfile.c source/blender/blenloader/intern/writefile.c source/blender/bmesh/intern/bmesh_construct.c source/blender/bmesh/intern/bmesh_mesh_conv.c source/blender/bmesh/intern/bmesh_mesh_conv.h source/blender/editors/interface/interface_templates.c source/blender/editors/interface/resources.c source/blender/editors/mesh/bmesh_select.c source/blender/editors/mesh/bmesh_tools.c source/blender/editors/space_view3d/drawobject.c source/blender/render/intern/source/shadeoutput.c |
||
---|---|---|
build_files | ||
doc | ||
extern | ||
intern | ||
release | ||
source | ||
CMakeLists.txt | ||
COPYING | ||
GNUmakefile | ||
SConstruct |