sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity
45,169 Commits 2 Branches 0 Tags 753 MiB
C++ 76%
Python 14.6%
C 5.2%
GLSL 1.8%
CMake 1.3%
Other 1%
ac9ec06ec1
Go to file
Tamito Kajiyama ac9ec06ec1 Merged changes in the trunk up to revision 54421. 
Conflicts resolved:
release/datafiles/startup.blend
release/scripts/startup/bl_ui/properties_render.py
source/blender/SConscript
source/blender/blenloader/intern/readfile.c
2013-02-10 10:17:59 +00:00
build_files Merged changes in the trunk up to revision 54421. 2013-02-10 10:17:59 +00:00
doc Merged changes in the trunk up to revision 54421. 2013-02-10 10:17:59 +00:00
extern Merged changes in the trunk up to revision 54421. 2013-02-10 10:17:59 +00:00
intern Merged changes in the trunk up to revision 54421. 2013-02-10 10:17:59 +00:00
release Merged changes in the trunk up to revision 54421. 2013-02-10 10:17:59 +00:00
source Merged changes in the trunk up to revision 54421. 2013-02-10 10:17:59 +00:00
CMakeLists.txt Merged changes in the trunk up to revision 54421. 2013-02-10 10:17:59 +00:00
COPYING == docs == 2010-10-13 14:44:22 +00:00
GNUmakefile code cleanup: comment unused members of bmesh operator slots and some osl style edits. 2012-11-20 14:31:58 +00:00
SConstruct Merged changes in the trunk up to revision 54421. 2013-02-10 10:17:59 +00:00