griefith/test

Go to file

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

build_files

Merged changes in the trunk up to revision 45133.

2012-03-25 08:20:19 +00:00

doc

Merged changes in the trunk up to revision 45133.

2012-03-25 08:20:19 +00:00

extern

fix for cmake error on non osx systems

2012-03-23 10:39:59 +00:00

intern

SVN maintenance.