Tamito Kajiyama
3b711a6ed0
Merged changes in the trunk up to revision 45133.
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/bmesh/intern/bmesh_construct.c
source/blender/bmesh/intern/bmesh_mesh_conv.c
source/blender/bmesh/intern/bmesh_mesh_conv.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/resources.c
source/blender/editors/mesh/bmesh_select.c
source/blender/editors/mesh/bmesh_tools.c
source/blender/editors/space_view3d/drawobject.c
source/blender/render/intern/source/shadeoutput.c
2012-03-25 08:20:19 +00:00
..
2012-03-25 08:20:19 +00:00
2012-03-25 08:20:19 +00:00
2012-03-25 08:20:19 +00:00
2012-03-21 06:33:31 +00:00
2012-02-17 18:59:41 +00:00
2012-02-17 18:59:41 +00:00
2012-02-17 18:59:41 +00:00
2012-03-09 18:28:30 +00:00
2012-02-17 18:59:41 +00:00
2012-02-17 18:59:41 +00:00
2012-02-17 18:59:41 +00:00
2012-03-25 08:20:19 +00:00
2012-03-10 17:49:26 +00:00
2012-02-29 15:00:37 +00:00