Tamito Kajiyama 65668dc5eb Merged changes in the trunk up to revision 41368.
Conflicts resolved:
source/blender/blenkernel/intern/library.c
source/blender/blenlib/intern/bpath.c
source/blender/render/intern/source/convertblender.c
2011-10-30 02:03:40 +00:00
2011-10-25 13:41:43 +00:00
2011-10-29 16:14:38 +00:00
2010-10-13 14:44:22 +00:00
Description
No description provided
841 MiB
Languages
C++ 78%
Python 14.9%
C 2.9%
GLSL 1.9%
CMake 1.2%
Other 0.9%