forked from bartvdbraak/blender
b6a9a953bc
Conflicts resolved: source/blender/bmesh/bmesh_class.h source/blender/bmesh/intern/bmesh_construct.c source/blender/editors/interface/resources.c source/blender/render/intern/source/convertblender.c |
||
---|---|---|
build_files | ||
doc | ||
extern | ||
intern | ||
release | ||
source | ||
CMakeLists.txt | ||
COPYING | ||
GNUmakefile | ||
SConstruct |