forked from bartvdbraak/blender
4ea2fb8b0a
Conflicts resolved: source/blender/blenkernel/intern/library.c source/blender/blenloader/intern/readfile.c source/blender/editors/interface/resources.c source/blender/makesrna/intern/rna_scene.c |
||
---|---|---|
.. | ||
libmv | ||
patches | ||
third_party | ||
bundle.sh | ||
ChangeLog | ||
CMakeLists.txt | ||
files.txt | ||
libmv-capi.cpp | ||
libmv-capi.h | ||
mkfiles.sh | ||
SConscript |