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

..

extern/include

Merged changes in the trunk up to revision 44221.

2012-02-18 11:26:11 +00:00

intern

Merged changes in the trunk up to revision 44612.

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

CMakeLists.txt

Merged changes in the trunk up to revision 43219.

2012-01-08 11:57:53 +00:00

SConscript

Merged changes in the trunk up to revision 44266 (including BMesh).

2012-02-21 01:40:04 +00:00