Tamito Kajiyama 9e93fc1e8a Merged changes in the trunk up to revision 44612. ...

Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/bmesh/bmesh.h

2012-03-03 01:43:44 +00:00

..

include

Merged changes in the trunk up to revision 44612.

2012-03-03 01:43:44 +00:00

raytrace

Spelling Cleanup

2012-03-01 12:20:18 +00:00

source

Merged changes in the trunk up to revision 44612.

2012-03-03 01:43:44 +00:00