Tamito Kajiyama d433cd65f7 Merged changes in the trunk up to revision 53146.
Conflicts resolved:
release/datafiles/startup.blend
source/blender/blenkernel/CMakeLists.txt
source/blender/blenlib/intern/bpath.c
source/blender/blenloader/intern/readfile.c
2012-12-19 01:49:58 +00:00
2012-12-18 19:35:54 +00:00
Description
No description provided
926 MiB
Languages
C++ 78.1%
Python 15%
C 2.8%
GLSL 1.8%
CMake 1.2%
Other 0.9%