Tamito Kajiyama 5524ed9ba2 Merged changes in the trunk up to revision 55700. ...

Conflicts resolved:
source/blender/editors/mesh/mesh_intern.h

2013-04-01 13:47:19 +00:00

..

extern/include

Merging r55547 through r55594 from trunk into soc-2008-mxcurioni

2013-03-26 09:09:31 +00:00

intern

Merged changes in the trunk up to revision 55700.

2013-04-01 13:47:19 +00:00

CMakeLists.txt

Merged changes in the trunk up to revision 55546.

2013-03-24 12:13:13 +00:00

SConscript

Merged changes in the trunk up to revision 55357.

2013-03-18 00:48:59 +00:00